aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-11-04 14:49:29 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2009-11-04 14:51:54 -0800
commit52e2bbd5c004f22b2affeec0fc03f1f9ca8c2a24 (patch)
treef5d20539ee7cf99a2f8243f1dbce88aac2706a79
parentd2d3464fcc8c230cc206cdb4d47f24c47ae6699d (diff)
downloadrails-52e2bbd5c004f22b2affeec0fc03f1f9ca8c2a24.tar.gz
rails-52e2bbd5c004f22b2affeec0fc03f1f9ca8c2a24.tar.bz2
rails-52e2bbd5c004f22b2affeec0fc03f1f9ca8c2a24.zip
Ruby 1.9: work around constant resolution behavior change :(
-rw-r--r--actionpack/test/abstract/helper_test.rb2
-rw-r--r--actionpack/test/dispatch/routing_test.rb4
2 files changed, 3 insertions, 3 deletions
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