test/unit/rack_handler_test.rb in m2r-1.0.0 vs test/unit/rack_handler_test.rb in m2r-2.0.0

@@ -1,15 +1,23 @@
 require 'test_helper'
 require 'm2r/rack_handler'
+require 'm2r/connection_factory'
 
 class HelloWorld
   def call(env)
     return [200, {'Content-Type' => 'text/plain'}, ["Hello world!"]]
   end
 end
 
 module M2R
+  class ConnectionFactory
+    class Custom
+      def initialize(*)
+      end
+    end
+  end
+
   class RackHandlerTest < MiniTest::Unit::TestCase
     def test_discoverability
       handler = ::Rack::Handler.get(:mongrel2)
       assert_equal ::Rack::Handler::Mongrel2, handler
 
@@ -24,22 +32,38 @@
         'recv_addr' => recv = 'tcp://1.2.3.4:1234',
         'send_addr' => send = 'tcp://1.2.3.4:4321',
         'sender_id' => id   = SecureRandom.uuid
       }
       cf = mock(:connection)
-      ConnectionFactory.expects(:new).with(id, recv, send).returns(cf)
+      ConnectionFactory.expects(:new).with(responds_with(:sender_id, id)).returns(cf)
       RackHandler.any_instance.stubs(:stop? => true)
       handler.run(HelloWorld.new, options)
     end
 
     def test_lint_rack_adapter
       factory    = stub(:connection)
-      handler    = RackHandler.new(app, factory)
+      handler    = RackHandler.new(app, factory, Request)
       response   = handler.process(root_request)
 
       assert_equal "Hello world!", response.body
       assert_equal 200, response.status
     end
+
+    def test_custom_connection_factory
+      require 'rack/handler/mongrel2'
+      handler = ::Rack::Handler::Mongrel2
+      options = {
+        'connection_factory' => 'custom'
+      }
+      cf = mock(:connection)
+      ConnectionFactory::Custom.expects(:new).with(responds_with(:connection_factory, 'custom')).returns(cf)
+      RackHandler.any_instance.stubs(:stop? => true)
+      handler.run(HelloWorld.new, options)
+    end
+
+
+    private
+
 
     def root_request
       data = %q("1c5fd481-1121-49d8-a706-69127975db1a ebb407b2-49aa-48a5-9f96-9db121051484 / 96:{"PATH":"/","host":"127.0.0.1:6767","PATTERN":"/","METHOD":"GET","VERSION":"HTTP/1.1","URI":"/"},0:,)
       Request.parse(data)
     end