From 52e2bbd5c004f22b2affeec0fc03f1f9ca8c2a24 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Wed, 4 Nov 2009 14:49:29 -0800 Subject: Ruby 1.9: work around constant resolution behavior change :( --- actionpack/test/abstract/helper_test.rb | 2 +- actionpack/test/dispatch/routing_test.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'actionpack') diff --git a/actionpack/test/abstract/helper_test.rb b/actionpack/test/abstract/helper_test.rb index 6c28f01fa4..efcd68e5c8 100644 --- a/actionpack/test/abstract/helper_test.rb +++ b/actionpack/test/abstract/helper_test.rb @@ -40,7 +40,7 @@ module AbstractController class AbstractHelpersBlock < ControllerWithHelpers helper do - include HelperyTest + include ::AbstractController::Testing::HelperyTest end end diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb index 7917c1974b..ca07bc7a28 100644 --- a/actionpack/test/dispatch/routing_test.rb +++ b/actionpack/test/dispatch/routing_test.rb @@ -37,7 +37,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest get 'admin', :to => "queenbee#index" end - constraints IpRestrictor do + constraints ::TestRoutingMapper::IpRestrictor do get 'admin/accounts', :to => "queenbee#accounts" end @@ -80,7 +80,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest end end - match 'sprockets.js', :to => SprocketsApp + match 'sprockets.js', :to => ::TestRoutingMapper::SprocketsApp match 'people/:id/update', :to => 'people#update', :as => :update_person match '/projects/:project_id/people/:id/update', :to => 'people#update', :as => :update_project_person -- cgit v1.2.3