aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-09-08 16:04:46 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-09-08 16:04:57 -0700
commitac1a363c6ed889d11e8fabd6dd69a8a6df9e3cfd (patch)
tree2cdf9a727bb90b2970c1ba397fbb079746f2b906 /actionpack/test
parent41a085ebc9cc7a939c00b058b757b41e106fa44e (diff)
downloadrails-ac1a363c6ed889d11e8fabd6dd69a8a6df9e3cfd.tar.gz
rails-ac1a363c6ed889d11e8fabd6dd69a8a6df9e3cfd.tar.bz2
rails-ac1a363c6ed889d11e8fabd6dd69a8a6df9e3cfd.zip
Pull up a method we only use once.
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/resources_test.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
index b60b30e954..b9cd15708b 100644
--- a/actionpack/test/controller/resources_test.rb
+++ b/actionpack/test/controller/resources_test.rb
@@ -532,7 +532,7 @@ class ResourcesTest < ActionController::TestCase
routes.each do |route|
routes.each do |r|
next if route === r # skip the comparison instance
- assert distinct_routes?(route, r), "Duplicate Route: #{route}"
+ assert_not_equal route.conditions, r.conditions
end
end
end
@@ -1351,8 +1351,4 @@ class ResourcesTest < ActionController::TestCase
assert_recognizes(expected_options, path)
end
end
-
- def distinct_routes? (r1, r2)
- assert_not_equal r1.conditions, r2.conditions
- end
end