aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-09-08 16:02:56 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-09-08 16:04:57 -0700
commit41a085ebc9cc7a939c00b058b757b41e106fa44e (patch)
treec620ebd76c5fee129dc42ca97a21de42aa0be9d1 /actionpack
parentcbf1dc78429bcceb9e90a3ff3159eafd8af5c711 (diff)
downloadrails-41a085ebc9cc7a939c00b058b757b41e106fa44e.tar.gz
rails-41a085ebc9cc7a939c00b058b757b41e106fa44e.tar.bz2
rails-41a085ebc9cc7a939c00b058b757b41e106fa44e.zip
Conditions must never be equal
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/controller/resources_test.rb7
1 files changed, 1 insertions, 6 deletions
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
index 3b1b5fc3ec..b60b30e954 100644
--- a/actionpack/test/controller/resources_test.rb
+++ b/actionpack/test/controller/resources_test.rb
@@ -1353,11 +1353,6 @@ class ResourcesTest < ActionController::TestCase
end
def distinct_routes? (r1, r2)
- if r1.conditions == r2.conditions and r1.constraints == r2.constraints then
- if r1.segments.collect(&:to_s) == r2.segments.collect(&:to_s) then
- return false
- end
- end
- true
+ assert_not_equal r1.conditions, r2.conditions
end
end