Use resourceful destroy method for messages

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

diff --git a/test/controllers/old_way_controller_test.rb b/test/controllers/old_way_controller_test.rb
index eae9d8a2eda1bea4fd8d71323728f64fff693d19..1fff791877764d777990a205d56afb4dccf0f431 100644 (file)
--- a/test/controllers/old_way_controller_test.rb
+++ b/test/controllers/old_way_controller_test.rb
@@ -2,8 +2,6 @@ require "test_helper"
 require "old_way_controller"
 
 class OldWayControllerTest < ActionController::TestCase
-  api_fixtures
-
   ##
   # test all routes which lead to this controller
   def test_routes
@@ -27,19 +25,19 @@ class OldWayControllerTest < ActionController::TestCase
 
   def test_history_visible
     # check that a visible way is returned properly
-    get :history, :id => create(:way, :with_history).id
+    get :history, :params => { :id => create(:way, :with_history).id }
     assert_response :success
   end
 
   def test_history_invisible
     # check that an invisible way's history is returned properly
-    get :history, :id => create(:way, :with_history, :deleted).id
+    get :history, :params => { :id => create(:way, :with_history, :deleted).id }
     assert_response :success
   end
 
   def test_history_invalid
     # check chat a non-existent way is not returned
-    get :history, :id => 0
+    get :history, :params => { :id => 0 }
     assert_response :not_found
   end
 
@@ -92,7 +90,7 @@ class OldWayControllerTest < ActionController::TestCase
   # test the redaction of an old version of a way, while being
   # authorised as a normal user.
   def test_redact_way_normal_user
-    basic_authorization(create(:user).email, "test")
+    basic_authorization create(:user).email, "test"
     way = create(:way, :with_history, :version => 4)
     way_v3 = way.old_ways.find_by(:version => 3)
 
@@ -104,7 +102,7 @@ class OldWayControllerTest < ActionController::TestCase
   # test that, even as moderator, the current version of a way
   # can't be redacted.
   def test_redact_way_current_version
-    basic_authorization(create(:moderator_user).email, "test")
+    basic_authorization create(:moderator_user).email, "test"
     way = create(:way, :with_history, :version => 4)
     way_latest = way.old_ways.last
 
@@ -120,12 +118,12 @@ class OldWayControllerTest < ActionController::TestCase
     way_v1 = way.old_ways.find_by(:version => 1)
     way_v1.redact!(create(:redaction))
 
-    get :version, :id => way_v1.way_id, :version => way_v1.version
+    get :version, :params => { :id => way_v1.way_id, :version => way_v1.version }
     assert_response :forbidden, "Redacted way shouldn't be visible via the version API."
 
     # not even to a logged-in user
-    basic_authorization(create(:user).email, "test")
-    get :version, :id => way_v1.way_id, :version => way_v1.version
+    basic_authorization create(:user).email, "test"
+    get :version, :params => { :id => way_v1.way_id, :version => way_v1.version }
     assert_response :forbidden, "Redacted way shouldn't be visible via the version API, even when logged in."
   end
 
@@ -136,14 +134,14 @@ class OldWayControllerTest < ActionController::TestCase
     way_v1 = way.old_ways.find_by(:version => 1)
     way_v1.redact!(create(:redaction))
 
-    get :history, :id => way_v1.way_id
+    get :history, :params => { :id => way_v1.way_id }
     assert_response :success, "Redaction shouldn't have stopped history working."
     assert_select "osm way[id='#{way_v1.way_id}'][version='#{way_v1.version}']", 0, "redacted way #{way_v1.way_id} version #{way_v1.version} shouldn't be present in the history."
 
     # not even to a logged-in user
-    basic_authorization(create(:user).email, "test")
-    get :version, :id => way_v1.way_id, :version => way_v1.version
-    get :history, :id => way_v1.way_id
+    basic_authorization create(:user).email, "test"
+    get :version, :params => { :id => way_v1.way_id, :version => way_v1.version }
+    get :history, :params => { :id => way_v1.way_id }
     assert_response :success, "Redaction shouldn't have stopped history working."
     assert_select "osm way[id='#{way_v1.way_id}'][version='#{way_v1.version}']", 0, "redacted node #{way_v1.way_id} version #{way_v1.version} shouldn't be present in the history, even when logged in."
   end
@@ -154,23 +152,23 @@ class OldWayControllerTest < ActionController::TestCase
   def test_redact_way_moderator
     way = create(:way, :with_history, :version => 4)
     way_v3 = way.old_ways.find_by(:version => 3)
-    basic_authorization(create(:moderator_user).email, "test")
+    basic_authorization create(:moderator_user).email, "test"
 
     do_redact_way(way_v3, create(:redaction))
     assert_response :success, "should be OK to redact old version as moderator."
 
     # check moderator can still see the redacted data, when passing
     # the appropriate flag
-    get :version, :id => way_v3.way_id, :version => way_v3.version
+    get :version, :params => { :id => way_v3.way_id, :version => way_v3.version }
     assert_response :forbidden, "After redaction, node should be gone for moderator, when flag not passed."
-    get :version, :id => way_v3.way_id, :version => way_v3.version, :show_redactions => "true"
+    get :version, :params => { :id => way_v3.way_id, :version => way_v3.version, :show_redactions => "true" }
     assert_response :success, "After redaction, node should not be gone for moderator, when flag passed."
 
     # and when accessed via history
-    get :history, :id => way_v3.way_id
+    get :history, :params => { :id => way_v3.way_id }
     assert_response :success, "Redaction shouldn't have stopped history working."
     assert_select "osm way[id='#{way_v3.way_id}'][version='#{way_v3.version}']", 0, "way #{way_v3.way_id} version #{way_v3.version} should not be present in the history for moderators when not passing flag."
-    get :history, :id => way_v3.way_id, :show_redactions => "true"
+    get :history, :params => { :id => way_v3.way_id, :show_redactions => "true" }
     assert_response :success, "Redaction shouldn't have stopped history working."
     assert_select "osm way[id='#{way_v3.way_id}'][version='#{way_v3.version}']", 1, "way #{way_v3.way_id} version #{way_v3.version} should still be present in the history for moderators when passing flag."
   end
@@ -180,20 +178,20 @@ class OldWayControllerTest < ActionController::TestCase
   def test_redact_way_is_redacted
     way = create(:way, :with_history, :version => 4)
     way_v3 = way.old_ways.find_by(:version => 3)
-    basic_authorization(create(:moderator_user).email, "test")
+    basic_authorization create(:moderator_user).email, "test"
 
     do_redact_way(way_v3, create(:redaction))
     assert_response :success, "should be OK to redact old version as moderator."
 
     # re-auth as non-moderator
-    basic_authorization(create(:user).email, "test")
+    basic_authorization create(:user).email, "test"
 
     # check can't see the redacted data
-    get :version, :id => way_v3.way_id, :version => way_v3.version
+    get :version, :params => { :id => way_v3.way_id, :version => way_v3.version }
     assert_response :forbidden, "Redacted node shouldn't be visible via the version API."
 
     # and when accessed via history
-    get :history, :id => way_v3.way_id
+    get :history, :params => { :id => way_v3.way_id }
     assert_response :success, "Redaction shouldn't have stopped history working."
     assert_select "osm way[id='#{way_v3.way_id}'][version='#{way_v3.version}']", 0, "redacted way #{way_v3.way_id} version #{way_v3.version} shouldn't be present in the history."
   end
@@ -206,7 +204,7 @@ class OldWayControllerTest < ActionController::TestCase
     way_v1 = way.old_ways.find_by(:version => 1)
     way_v1.redact!(create(:redaction))
 
-    post :redact, :id => way_v1.way_id, :version => way_v1.version
+    post :redact, :params => { :id => way_v1.way_id, :version => way_v1.version }
     assert_response :unauthorized, "should need to be authenticated to unredact."
   end
 
@@ -218,9 +216,9 @@ class OldWayControllerTest < ActionController::TestCase
     way_v1 = way.old_ways.find_by(:version => 1)
     way_v1.redact!(create(:redaction))
 
-    basic_authorization(create(:user).email, "test")
+    basic_authorization create(:user).email, "test"
 
-    post :redact, :id => way_v1.way_id, :version => way_v1.version
+    post :redact, :params => { :id => way_v1.way_id, :version => way_v1.version }
     assert_response :forbidden, "should need to be moderator to unredact."
   end
 
@@ -233,29 +231,29 @@ class OldWayControllerTest < ActionController::TestCase
     way_v1 = way.old_ways.find_by(:version => 1)
     way_v1.redact!(create(:redaction))
 
-    basic_authorization(moderator_user.email, "test")
+    basic_authorization moderator_user.email, "test"
 
-    post :redact, :id => way_v1.way_id, :version => way_v1.version
+    post :redact, :params => { :id => way_v1.way_id, :version => way_v1.version }
     assert_response :success, "should be OK to unredact old version as moderator."
 
     # check moderator can still see the unredacted data, without passing
     # the appropriate flag
-    get :version, :id => way_v1.way_id, :version => way_v1.version
+    get :version, :params => { :id => way_v1.way_id, :version => way_v1.version }
     assert_response :success, "After unredaction, node should not be gone for moderator."
 
     # and when accessed via history
-    get :history, :id => way_v1.way_id
+    get :history, :params => { :id => way_v1.way_id }
     assert_response :success, "Unredaction shouldn't have stopped history working."
     assert_select "osm way[id='#{way_v1.way_id}'][version='#{way_v1.version}']", 1, "way #{way_v1.way_id} version #{way_v1.version} should still be present in the history for moderators."
 
-    basic_authorization(create(:user).email, "test")
+    basic_authorization create(:user).email, "test"
 
     # check normal user can now see the unredacted data
-    get :version, :id => way_v1.way_id, :version => way_v1.version
+    get :version, :params => { :id => way_v1.way_id, :version => way_v1.version }
     assert_response :success, "After redaction, node should not be gone for moderator, when flag passed."
 
     # and when accessed via history
-    get :history, :id => way_v1.way_id
+    get :history, :params => { :id => way_v1.way_id }
     assert_response :success, "Redaction shouldn't have stopped history working."
     assert_select "osm way[id='#{way_v1.way_id}'][version='#{way_v1.version}']", 1, "way #{way_v1.way_id} version #{way_v1.version} should still be present in the history for normal users."
   end
@@ -268,14 +266,14 @@ class OldWayControllerTest < ActionController::TestCase
   def check_current_version(way_id)
     # get the current version
     current_way = with_controller(WayController.new) do
-      get :read, :id => way_id
+      get :read, :params => { :id => way_id }
       assert_response :success, "can't get current way #{way_id}"
       Way.from_xml(@response.body)
     end
     assert_not_nil current_way, "getting way #{way_id} returned nil"
 
     # get the "old" version of the way from the version method
-    get :version, :id => way_id, :version => current_way.version
+    get :version, :params => { :id => way_id, :version => current_way.version }
     assert_response :success, "can't get old way #{way_id}, v#{current_way.version}"
     old_way = Way.from_xml(@response.body)
 
@@ -287,7 +285,7 @@ class OldWayControllerTest < ActionController::TestCase
   # look at all the versions of the way in the history and get each version from
   # the versions call. check that they're the same.
   def check_history_equals_versions(way_id)
-    get :history, :id => way_id
+    get :history, :params => { :id => way_id }
     assert_response :success, "can't get way #{way_id} from API"
     history_doc = XML::Parser.string(@response.body).parse
     assert_not_nil history_doc, "parsing way #{way_id} history failed"
@@ -296,7 +294,7 @@ class OldWayControllerTest < ActionController::TestCase
       history_way = Way.from_xml_node(way_doc)
       assert_not_nil history_way, "parsing way #{way_id} version failed"
 
-      get :version, :id => way_id, :version => history_way.version
+      get :version, :params => { :id => way_id, :version => history_way.version }
       assert_response :success, "couldn't get way #{way_id}, v#{history_way.version}"
       version_way = Way.from_xml(@response.body)
       assert_not_nil version_way, "failed to parse #{way_id}, v#{history_way.version}"
@@ -306,11 +304,11 @@ class OldWayControllerTest < ActionController::TestCase
   end
 
   def do_redact_way(way, redaction)
-    get :version, :id => way.way_id, :version => way.version
+    get :version, :params => { :id => way.way_id, :version => way.version }
     assert_response :success, "should be able to get version #{way.version} of way #{way.way_id}."
 
     # now redact it
-    post :redact, :id => way.way_id, :version => way.version, :redaction => redaction.id
+    post :redact, :params => { :id => way.way_id, :version => way.version, :redaction => redaction.id }
   end
 
   def propagate_tags(way, old_way)