4 files changed, 8 insertions, 5 deletions
diff --git a/railties/test/dispatcher_test.rb b/railties/test/dispatcher_test.rb
index ba41b93b24..caf36fc9e9 100644
--- a/railties/test/dispatcher_test.rb
+++ b/railties/test/dispatcher_test.rb
@@ -35,7 +35,7 @@ class DispatcherTest < Test::Unit::TestCase
   def test_ac_subclasses_cleared_on_reset
     Object.class_eval(ACTION_CONTROLLER_DEF)
     assert_equal 1, ActionController::Base.subclasses.length
-    Dispatcher.dispatch(CGI.new, ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, @output)
+    dispatch
 
     GC.start # force the subclass to be collected
     assert_equal 0, ActionController::Base.subclasses.length
@@ -44,13 +44,16 @@ class DispatcherTest < Test::Unit::TestCase
   def test_am_subclasses_cleared_on_reset
     Object.class_eval(ACTION_MAILER_DEF)
     assert_equal 1, ActionMailer::Base.subclasses.length
-    Dispatcher.dispatch(CGI.new, ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, @output)
+    dispatch
 
     GC.start # force the subclass to be collected
     assert_equal 0, ActionMailer::Base.subclasses.length
   end
 
   private
+    def dispatch
+      Dispatcher.dispatch(CGI.new, ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, @output)
+    end
 
     def setup_minimal_environment
       value = Dependencies::LoadingModule.root
diff --git a/railties/test/script/generators/working/working_generator.rb b/railties/test/generators/working/working_generator.rb
index 465b34319a..465b34319a 100644
--- a/railties/test/script/generators/working/working_generator.rb
+++ b/railties/test/generators/working/working_generator.rb
diff --git a/railties/test/mocks/dispatcher.rb b/railties/test/mocks/dispatcher.rb
index 6561a13581..3391f398bf 100644
--- a/railties/test/mocks/dispatcher.rb
+++ b/railties/test/mocks/dispatcher.rb
@@ -4,7 +4,7 @@ class Dispatcher
     attr_accessor :raise_exception
     attr_accessor :dispatch_hook
 
-    def dispatch(cgi)
+    def dispatch(cgi, session_options = nil, output = $stdout)
       dispatch_hook.call(cgi) if dispatch_hook
       sleep(time_to_sleep || 0)
       raise raise_exception, "Something died" if raise_exception
diff --git a/railties/test/rails_generator_test.rb b/railties/test/rails_generator_test.rb
index 5934bb3e7b..3f63509384 100644
--- a/railties/test/rails_generator_test.rb
+++ b/railties/test/rails_generator_test.rb
@@ -44,7 +44,7 @@ class RailsGeneratorTest < Test::Unit::TestCase
   end
 
   def test_lookup_missing_generator
-    assert_raise(LoadError) {
+    assert_raise(MissingSourceFile) {
       Rails::Generator::Base.lookup('missing_generator').klass
     }
   end
@@ -68,7 +68,7 @@ class RailsGeneratorTest < Test::Unit::TestCase
   def test_generator_spec
     spec = Rails::Generator::Base.lookup('working')
     assert_equal 'working', spec.name
-    assert_equal "#{RAILS_ROOT}/script/generators/working", spec.path
+    assert_equal "#{RAILS_ROOT}/generators/working", spec.path
     assert_equal :app, spec.source
     assert_nothing_raised { assert_match /WorkingGenerator$/, spec.klass.name }
   end