Fix failing Action Pack tests

rails · Mar 2, 2010 · d78e3fe · d78e3fe
1 parent 9f83cdc
commit d78e3fe
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
@@ -152,7 +152,7 @@ def _assigns
       end
 
       def method_missing(selector, *args)
-        if ActionDispatch::Routing::Routes.named_routes.helpers.include?(selector)
+        if @controller._router.named_routes.helpers.include?(selector)
           @controller.__send__(selector, *args)
         else
           super

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
@@ -203,6 +203,16 @@ def assert_header(name, value)
 class ::ApplicationController < ActionController::Base
 end
 
+module ActionView
+  class TestCase
+    # Must repeat the setup because AV::TestCase is a duplication
+    # of AC::TestCase
+    setup do
+      @router = SharedTestRoutes
+    end
+  end
+end
+
 module ActionController
   class Base
     include ActionController::Testing

diff --git a/actionpack/test/activerecord/controller_runtime_test.rb b/actionpack/test/activerecord/controller_runtime_test.rb
@@ -17,9 +17,9 @@ def show
   tests LogSubscriberController
 
   def setup
+    super
     @old_logger = ActionController::Base.logger
     Rails::LogSubscriber.add(:action_controller, ActionController::Railties::LogSubscriber.new)
-    super
   end
 
   def teardown

diff --git a/actionpack/test/controller/log_subscriber_test.rb b/actionpack/test/controller/log_subscriber_test.rb
@@ -40,14 +40,15 @@ class ACLogSubscriberTest < ActionController::TestCase
   include Rails::LogSubscriber::TestHelper
 
   def setup
+    super
+
     @old_logger = ActionController::Base.logger
 
     @cache_path = File.expand_path('../temp/test_cache', File.dirname(__FILE__))
     ActionController::Base.page_cache_directory = @cache_path
     ActionController::Base.cache_store = :file_store, @cache_path
 
     Rails::LogSubscriber.add(:action_controller, ActionController::Railties::LogSubscriber.new)
-    super
   end
 
   def teardown

diff --git a/actionpack/test/template/log_subscriber_test.rb b/actionpack/test/template/log_subscriber_test.rb
@@ -7,11 +7,11 @@ class AVLogSubscriberTest < ActiveSupport::TestCase
   include Rails::LogSubscriber::TestHelper
 
   def setup
+    super
     @old_logger = ActionController::Base.logger
     @view = ActionView::Base.new(ActionController::Base.view_paths, {})
     Rails.stubs(:root).returns(File.expand_path(FIXTURE_LOAD_PATH))
     Rails::LogSubscriber.add(:action_view, ActionView::Railties::LogSubscriber.new)
-    super
   end
 
   def teardown