From 7b3202ab2790e477301b82313b66c95729d491ac Mon Sep 17 00:00:00 2001
From: Annie Caron <annie.caron@cgi.com>
Date: Thu, 28 Jan 2016 07:52:38 -0500
Subject: [PATCH] Refactoring of the test helpers and add env and app as
 memoize

---
 lib/warden/test/helpers.rb | 52 ++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/lib/warden/test/helpers.rb b/lib/warden/test/helpers.rb
index abf3372..3950433 100644
--- a/lib/warden/test/helpers.rb
+++ b/lib/warden/test/helpers.rb
@@ -38,43 +38,41 @@ def logout(*scopes)
       # @api public
       def warden
         @warden ||= begin
-          env = env_with_params
-          setup_rack(success_app).call(env)
           env['warden']
         end
       end
 
       private
 
-      FAILURE_APP = lambda{|e|[401, {"Content-Type" => "text/plain"}, ["You Fail!"]] }
+      def env
+        @env ||= begin
+          request = Rack::MockRequest.env_for(
+            "/?#{Rack::Utils.build_query({})}",
+            { 'HTTP_VERSION' => '1.1', 'REQUEST_METHOD' => 'GET' }
+          )
+          app.call(request)
 
-      def env_with_params(path = "/", params = {}, env = {})
-        method = params.delete(:method) || "GET"
-        env = { 'HTTP_VERSION' => '1.1', 'REQUEST_METHOD' => "#{method}" }.merge(env)
-        Rack::MockRequest.env_for("#{path}?#{Rack::Utils.build_query(params)}", env)
-      end
-
-      def setup_rack(app = nil, opts = {}, &block)
-        app ||= block if block_given?
-
-        opts[:failure_app]         ||= failure_app
-        opts[:default_strategies]  ||= [:password]
-        opts[:default_serializers] ||= [:session]
-        blk = opts[:configurator] || proc{}
-
-        Rack::Builder.new do
-          use opts[:session] || Warden::Test::Helpers::Session unless opts[:nil_session]
-          use Warden::Manager, opts, &blk
-          run app
+          request
         end
       end
 
-      def failure_app
-        Warden::Test::Helpers::FAILURE_APP
-      end
-
-      def success_app
-        lambda{|e| [200, {"Content-Type" => "text/plain"}, ["You Win"]]}
+      def app
+        @app ||= begin
+          opts = {
+            failure_app: lambda {
+              [401, { 'Content-Type' => 'text/plain' }, ['You Fail!']]
+            },
+            default_strategies: :password,
+            default_serializers: :session
+          }
+          Rack::Builder.new do
+            use Warden::Test::Helpers::Session
+            use Warden::Manager, opts, &proc {}
+            run lambda { |e|
+              [200, { 'Content-Type' => 'text/plain' }, ['You Win']]
+            }
+          end
+        end
       end
 
       class Session