Merge branch 'master' of git@github.com:rails/rails

2 files changed, 19 insertions, 54 deletions

diff --git a/railties/test/fcgi_dispatcher_test.rb b/railties/test/fcgi_dispatcher_test.rb
index cc054c24aa..c469c5dd01 100644
--- a/railties/test/fcgi_dispatcher_test.rb
+++ b/railties/test/fcgi_dispatcher_test.rb
@@ -1,10 +1,9 @@
 require 'abstract_unit'
 
 begin
+require 'action_controller'
 require 'fcgi_handler'
 
-module ActionController; module Routing; module Routes; end end end
-
 class RailsFCGIHandlerTest < Test::Unit::TestCase
   def setup
     @log = StringIO.new
@@ -131,19 +130,11 @@ class RailsFCGIHandlerSignalsTest < Test::Unit::TestCase
     end
   end
 
-  class ::Dispatcher
-    class << self
-      attr_accessor :signal
-      alias_method :old_dispatch, :dispatch
-      def dispatch(cgi)
-        signal ? Process.kill(signal, $$) : old_dispatch
-      end
-    end
-  end
-
   def setup
     @log = StringIO.new
     @handler = RailsFCGIHandler.new(@log)
+    @dispatcher = mock
+    Dispatcher.stubs(:new).returns(@dispatcher)
   end
 
   def test_interrupted_via_HUP_when_not_in_request
@@ -159,19 +150,6 @@ class RailsFCGIHandlerSignalsTest < Test::Unit::TestCase
     assert_equal :reload, @handler.when_ready
   end
 
-  def test_interrupted_via_HUP_when_in_request
-    cgi = mock
-    FCGI.expects(:each_cgi).once.yields(cgi)
-    Dispatcher.expects(:signal).times(2).returns('HUP')
-
-    @handler.expects(:reload!).once
-    @handler.expects(:close_connection).never
-    @handler.expects(:exit).never
-
-    @handler.process!
-    assert_equal :reload, @handler.when_ready
-  end
-
   def test_interrupted_via_USR1_when_not_in_request
     cgi = mock
     FCGI.expects(:each_cgi).once.yields(cgi)
@@ -186,19 +164,6 @@ class RailsFCGIHandlerSignalsTest < Test::Unit::TestCase
     assert_nil @handler.when_ready
   end
 
-  def test_interrupted_via_USR1_when_in_request
-    cgi = mock
-    FCGI.expects(:each_cgi).once.yields(cgi)
-    Dispatcher.expects(:signal).times(2).returns('USR1')
-
-    @handler.expects(:reload!).never
-    @handler.expects(:close_connection).with(cgi).once
-    @handler.expects(:exit).never
-
-    @handler.process!
-    assert_equal :exit, @handler.when_ready
-  end
-
   def test_restart_via_USR2_when_in_request
     cgi = mock
     FCGI.expects(:each_cgi).once.yields(cgi)
@@ -217,7 +182,7 @@ class RailsFCGIHandlerSignalsTest < Test::Unit::TestCase
   def test_interrupted_via_TERM
     cgi = mock
     FCGI.expects(:each_cgi).once.yields(cgi)
-    Dispatcher.expects(:signal).times(2).returns('TERM')
+    ::Rack::Handler::FastCGI.expects(:serve).once.returns('TERM')
 
     @handler.expects(:reload!).never
     @handler.expects(:close_connection).never
@@ -238,7 +203,7 @@ class RailsFCGIHandlerSignalsTest < Test::Unit::TestCase
     cgi = mock
     error = RuntimeError.new('foo')
     FCGI.expects(:each_cgi).once.yields(cgi)
-    Dispatcher.expects(:dispatch).once.with(cgi).raises(error)
+    ::Rack::Handler::FastCGI.expects(:serve).once.raises(error)
     @handler.expects(:dispatcher_error).with(error, regexp_matches(/^unhandled/))
     @handler.process!
   end
@@ -254,7 +219,7 @@ class RailsFCGIHandlerSignalsTest < Test::Unit::TestCase
     cgi = mock
     error = SignalException.new('USR2')
     FCGI.expects(:each_cgi).once.yields(cgi)
-    Dispatcher.expects(:dispatch).once.with(cgi).raises(error)
+    ::Rack::Handler::FastCGI.expects(:serve).once.raises(error)
     @handler.expects(:dispatcher_error).with(error, regexp_matches(/^stopping/))
     @handler.process!
   end
@@ -284,7 +249,7 @@ class RailsFCGIHandlerPeriodicGCTest < Test::Unit::TestCase
 
     cgi = mock
     FCGI.expects(:each_cgi).times(10).yields(cgi)
-    Dispatcher.expects(:dispatch).times(10).with(cgi)
+    Dispatcher.expects(:new).times(10)
 
     @handler.expects(:run_gc!).never
     9.times { @handler.process! }
diff --git a/railties/test/gem_dependency_test.rb b/railties/test/gem_dependency_test.rb
index 30fd899fea..6c1f0961a1 100644
--- a/railties/test/gem_dependency_test.rb
+++ b/railties/test/gem_dependency_test.rb
@@ -9,33 +9,33 @@ Rails::VendorGemSourceIndex.silence_spec_warnings = true
 uses_mocha "Plugin Tests" do
   class GemDependencyTest < Test::Unit::TestCase
     def setup
-      @gem              = Rails::GemDependency.new "hpricot"
-      @gem_with_source  = Rails::GemDependency.new "hpricot", :source => "http://code.whytheluckystiff.net"
-      @gem_with_version = Rails::GemDependency.new "hpricot", :version => "= 0.6"
-      @gem_with_lib     = Rails::GemDependency.new "aws-s3", :lib => "aws/s3"
-      @gem_without_load  = Rails::GemDependency.new "hpricot", :lib => false
+      @gem              = Rails::GemDependency.new "xhpricotx"
+      @gem_with_source  = Rails::GemDependency.new "xhpricotx", :source => "http://code.whytheluckystiff.net"
+      @gem_with_version = Rails::GemDependency.new "xhpricotx", :version => "= 0.6"
+      @gem_with_lib     = Rails::GemDependency.new "xaws-s3x", :lib => "aws/s3"
+      @gem_without_load  = Rails::GemDependency.new "xhpricotx", :lib => false
     end
 
     def test_configuration_adds_gem_dependency
       config = Rails::Configuration.new
-      config.gem "aws-s3", :lib => "aws/s3", :version => "0.4.0"
-      assert_equal [["install", "aws-s3", "--version", '"= 0.4.0"']], config.gems.collect(&:install_command)
+      config.gem "xaws-s3x", :lib => "aws/s3", :version => "0.4.0"
+      assert_equal [["install", "xaws-s3x", "--version", '"= 0.4.0"']], config.gems.collect(&:install_command)
     end
 
     def test_gem_creates_install_command
-      assert_equal %w(install hpricot), @gem.install_command
+      assert_equal %w(install xhpricotx), @gem.install_command
     end
 
     def test_gem_with_source_creates_install_command
-      assert_equal %w(install hpricot --source http://code.whytheluckystiff.net), @gem_with_source.install_command
+      assert_equal %w(install xhpricotx --source http://code.whytheluckystiff.net), @gem_with_source.install_command
     end
 
     def test_gem_with_version_creates_install_command
-      assert_equal ["install", "hpricot", "--version", '"= 0.6"'], @gem_with_version.install_command
+      assert_equal ["install", "xhpricotx", "--version", '"= 0.6"'], @gem_with_version.install_command
     end
 
     def test_gem_creates_unpack_command
-      assert_equal %w(unpack hpricot), @gem.unpack_command
+      assert_equal %w(unpack xhpricotx), @gem.unpack_command
     end
 
     def test_gem_with_version_unpack_install_command
@@ -43,7 +43,7 @@ uses_mocha "Plugin Tests" do
       mock_spec = mock()
       mock_spec.stubs(:version).returns('0.6')
       @gem_with_version.stubs(:specification).returns(mock_spec)
-      assert_equal ["unpack", "hpricot", "--version", '= 0.6'], @gem_with_version.unpack_command
+      assert_equal ["unpack", "xhpricotx", "--version", '= 0.6'], @gem_with_version.unpack_command
     end
 
     def test_gem_adds_load_paths