From 41a085ebc9cc7a939c00b058b757b41e106fa44e Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 8 Sep 2011 16:02:56 -0700 Subject: Conditions must never be equal --- actionpack/test/controller/resources_test.rb | 7 +------ 1 file changed, 1 insertion(+), 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 -- cgit v1.2.3