Merge branch 'master' into openstreetbugs

[rails.git] / test / functional / old_way_controller_test.rb

diff --git a/test/functional/old_way_controller_test.rb b/test/functional/old_way_controller_test.rb
index 31da1d2c784bb18d6598cbc52a486b77760343d7..9dd542c525490856d9c826df7ae67d075e350273 100644 (file)
--- a/test/functional/old_way_controller_test.rb
+++ b/test/functional/old_way_controller_test.rb
@@ -10,13 +10,13 @@ class OldWayControllerTest < ActionController::TestCase
 
   def test_history_visible
     # check that a visible way is returned properly
 
   def test_history_visible
     # check that a visible way is returned properly

-    get :history, :id => ways(:visible_way).id
+    get :history, :id => ways(:visible_way).way_id

     assert_response :success
   end
   
   def test_history_invisible
     # check that an invisible way's history is returned properly
     assert_response :success
   end
   
   def test_history_invisible
     # check that an invisible way's history is returned properly

-    get :history, :id => ways(:invisible_way).id
+    get :history, :id => ways(:invisible_way).way_id

     assert_response :success
   end
   
     assert_response :success
   end