Ensure that test utility methods are marked as private

[rails.git] / test / controllers / api / old_ways_controller_test.rb

diff --git a/test/controllers/api/old_ways_controller_test.rb b/test/controllers/api/old_ways_controller_test.rb
index cd676a960f945fa99801b9070b6b505c38f13c46..c77117589956772af585e40a3ab2cb98c566a72c 100644 (file)
--- a/test/controllers/api/old_ways_controller_test.rb
+++ b/test/controllers/api/old_ways_controller_test.rb
@@ -1,7 +1,7 @@
 require "test_helper"
 
 module Api
 require "test_helper"
 
 module Api

-  class OldWaysControllerTest < ActionController::TestCase
+  class OldWaysControllerTest < ActionDispatch::IntegrationTest

     ##
     # test all routes which lead to this controller
     def test_routes
     ##
     # test all routes which lead to this controller
     def test_routes


@@ -33,19 +33,19 @@ module Api
 
     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, :params => { :id => create(:way, :with_history).id }
+      get api_way_history_path(create(:way, :with_history))

       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, :params => { :id => create(:way, :with_history, :deleted).id }
+      get api_way_history_path(create(:way, :with_history, :deleted))

       assert_response :success
     end
 
     def test_history_invalid
       # check chat a non-existent way is not returned
       assert_response :success
     end
 
     def test_history_invalid
       # check chat a non-existent way is not returned

-      get :history, :params => { :id => 0 }
+      get api_way_history_path(:id => 0)

       assert_response :not_found
     end
 
       assert_response :not_found
     end
 


@@ -98,11 +98,11 @@ module Api
     # test the redaction of an old version of a way, while being
     # authorised as a normal user.
     def test_redact_way_normal_user
     # 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"
+      auth_header = basic_authorization_header create(:user).email, "test"

       way = create(:way, :with_history, :version => 4)
       way_v3 = way.old_ways.find_by(:version => 3)
 
       way = create(:way, :with_history, :version => 4)
       way_v3 = way.old_ways.find_by(:version => 3)
 

-      do_redact_way(way_v3, create(:redaction))
+      do_redact_way(way_v3, create(:redaction), auth_header)

       assert_response :forbidden, "should need to be moderator to redact."
     end
 
       assert_response :forbidden, "should need to be moderator to redact."
     end
 


@@ -110,11 +110,11 @@ module Api
     # test that, even as moderator, the current version of a way
     # can't be redacted.
     def test_redact_way_current_version
     # 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"
+      auth_header = basic_authorization_header create(:moderator_user).email, "test"

       way = create(:way, :with_history, :version => 4)
       way_latest = way.old_ways.last
 
       way = create(:way, :with_history, :version => 4)
       way_latest = way.old_ways.last
 

-      do_redact_way(way_latest, create(:redaction))
+      do_redact_way(way_latest, create(:redaction), auth_header)

       assert_response :bad_request, "shouldn't be OK to redact current version as moderator."
     end
 
       assert_response :bad_request, "shouldn't be OK to redact current version as moderator."
     end
 


@@ -126,12 +126,12 @@ module Api
       way_v1 = way.old_ways.find_by(:version => 1)
       way_v1.redact!(create(:redaction))
 
       way_v1 = way.old_ways.find_by(:version => 1)
       way_v1.redact!(create(:redaction))
 

-      get :version, :params => { :id => way_v1.way_id, :version => way_v1.version }
+      get way_version_path(: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
       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, :params => { :id => way_v1.way_id, :version => way_v1.version }
+      auth_header = basic_authorization_header create(:user).email, "test"
+      get way_version_path(:id => way_v1.way_id, :version => way_v1.version), :headers => auth_header

       assert_response :forbidden, "Redacted way shouldn't be visible via the version API, even when logged in."
     end
 
       assert_response :forbidden, "Redacted way shouldn't be visible via the version API, even when logged in."
     end
 


@@ -142,14 +142,14 @@ module Api
       way_v1 = way.old_ways.find_by(:version => 1)
       way_v1.redact!(create(:redaction))
 
       way_v1 = way.old_ways.find_by(:version => 1)
       way_v1.redact!(create(:redaction))
 

-      get :history, :params => { :id => way_v1.way_id }
+      get api_way_history_path(: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
       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, :params => { :id => way_v1.way_id, :version => way_v1.version }
-      get :history, :params => { :id => way_v1.way_id }
+      auth_header = basic_authorization_header create(:user).email, "test"
+      get way_version_path(:id => way_v1.way_id, :version => way_v1.version), :headers => auth_header
+      get api_way_history_path(:id => way_v1.way_id), :headers => auth_header

       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
       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


@@ -160,23 +160,23 @@ module Api
     def test_redact_way_moderator
       way = create(:way, :with_history, :version => 4)
       way_v3 = way.old_ways.find_by(:version => 3)
     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"
+      auth_header = basic_authorization_header create(:moderator_user).email, "test"

 
 

-      do_redact_way(way_v3, create(:redaction))
+      do_redact_way(way_v3, create(:redaction), auth_header)

       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
       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, :params => { :id => way_v3.way_id, :version => way_v3.version }
+      get way_version_path(:id => way_v3.way_id, :version => way_v3.version), :headers => auth_header

       assert_response :forbidden, "After redaction, node should be gone for moderator, when flag not passed."
       assert_response :forbidden, "After redaction, node should be gone for moderator, when flag not passed."

-      get :version, :params => { :id => way_v3.way_id, :version => way_v3.version, :show_redactions => "true" }
+      get way_version_path(:id => way_v3.way_id, :version => way_v3.version), :params => { :show_redactions => "true" }, :headers => auth_header

       assert_response :success, "After redaction, node should not be gone for moderator, when flag passed."
 
       # and when accessed via history
       assert_response :success, "After redaction, node should not be gone for moderator, when flag passed."
 
       # and when accessed via history

-      get :history, :params => { :id => way_v3.way_id }
+      get api_way_history_path(:id => way_v3.way_id), :headers => auth_header

       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."
       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, :params => { :id => way_v3.way_id, :show_redactions => "true" }
+      get api_way_history_path(:id => way_v3.way_id), :params => { :show_redactions => "true" }, :headers => auth_header

       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
       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


@@ -186,20 +186,20 @@ module Api
     def test_redact_way_is_redacted
       way = create(:way, :with_history, :version => 4)
       way_v3 = way.old_ways.find_by(:version => 3)
     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"
+      auth_header = basic_authorization_header create(:moderator_user).email, "test"

 
 

-      do_redact_way(way_v3, create(:redaction))
+      do_redact_way(way_v3, create(:redaction), auth_header)

       assert_response :success, "should be OK to redact old version as moderator."
 
       # re-auth as non-moderator
       assert_response :success, "should be OK to redact old version as moderator."
 
       # re-auth as non-moderator

-      basic_authorization create(:user).email, "test"
+      auth_header = basic_authorization_header create(:user).email, "test"

 
       # check can't see the redacted data
 
       # check can't see the redacted data

-      get :version, :params => { :id => way_v3.way_id, :version => way_v3.version }
+      get way_version_path(:id => way_v3.way_id, :version => way_v3.version), :headers => auth_header

       assert_response :forbidden, "Redacted node shouldn't be visible via the version API."
 
       # and when accessed via history
       assert_response :forbidden, "Redacted node shouldn't be visible via the version API."
 
       # and when accessed via history

-      get :history, :params => { :id => way_v3.way_id }
+      get api_way_history_path(:id => way_v3.way_id), :headers => auth_header

       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
       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


@@ -212,7 +212,7 @@ module Api
       way_v1 = way.old_ways.find_by(:version => 1)
       way_v1.redact!(create(:redaction))
 
       way_v1 = way.old_ways.find_by(:version => 1)
       way_v1.redact!(create(:redaction))
 

-      post :redact, :params => { :id => way_v1.way_id, :version => way_v1.version }
+      post way_version_redact_path(:id => way_v1.way_id, :version => way_v1.version)

       assert_response :unauthorized, "should need to be authenticated to unredact."
     end
 
       assert_response :unauthorized, "should need to be authenticated to unredact."
     end
 


@@ -224,9 +224,9 @@ module Api
       way_v1 = way.old_ways.find_by(:version => 1)
       way_v1.redact!(create(:redaction))
 
       way_v1 = way.old_ways.find_by(:version => 1)
       way_v1.redact!(create(:redaction))
 

-      basic_authorization create(:user).email, "test"
+      auth_header = basic_authorization_header create(:user).email, "test"

 
 

-      post :redact, :params => { :id => way_v1.way_id, :version => way_v1.version }
+      post way_version_redact_path(:id => way_v1.way_id, :version => way_v1.version), :headers => auth_header

       assert_response :forbidden, "should need to be moderator to unredact."
     end
 
       assert_response :forbidden, "should need to be moderator to unredact."
     end
 


@@ -239,29 +239,29 @@ module Api
       way_v1 = way.old_ways.find_by(:version => 1)
       way_v1.redact!(create(:redaction))
 
       way_v1 = way.old_ways.find_by(:version => 1)
       way_v1.redact!(create(:redaction))
 

-      basic_authorization moderator_user.email, "test"
+      auth_header = basic_authorization_header moderator_user.email, "test"

 
 

-      post :redact, :params => { :id => way_v1.way_id, :version => way_v1.version }
+      post way_version_redact_path(:id => way_v1.way_id, :version => way_v1.version), :headers => auth_header

       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
       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, :params => { :id => way_v1.way_id, :version => way_v1.version }
+      get way_version_path(:id => way_v1.way_id, :version => way_v1.version), :headers => auth_header

       assert_response :success, "After unredaction, node should not be gone for moderator."
 
       # and when accessed via history
       assert_response :success, "After unredaction, node should not be gone for moderator."
 
       # and when accessed via history

-      get :history, :params => { :id => way_v1.way_id }
+      get api_way_history_path(:id => way_v1.way_id), :headers => auth_header

       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."
 
       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"
+      auth_header = basic_authorization_header create(:user).email, "test"

 
       # check normal user can now see the unredacted data
 
       # check normal user can now see the unredacted data

-      get :version, :params => { :id => way_v1.way_id, :version => way_v1.version }
+      get way_version_path(:id => way_v1.way_id, :version => way_v1.version), :headers => auth_header

       assert_response :success, "After redaction, node should not be gone for moderator, when flag passed."
 
       # and when accessed via history
       assert_response :success, "After redaction, node should not be gone for moderator, when flag passed."
 
       # and when accessed via history

-      get :history, :params => { :id => way_v1.way_id }
+      get api_way_history_path(:id => way_v1.way_id), :headers => auth_header

       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
       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


@@ -274,14 +274,14 @@ module Api
     def check_current_version(way_id)
       # get the current version
       current_way = with_controller(WaysController.new) do
     def check_current_version(way_id)
       # get the current version
       current_way = with_controller(WaysController.new) do

-        get :show, :params => { :id => way_id }
+        get api_way_path(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
         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, :params => { :id => way_id, :version => current_way.version }
+      get way_version_path(: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)
 
       assert_response :success, "can't get old way #{way_id}, v#{current_way.version}"
       old_way = Way.from_xml(@response.body)
 


@@ -293,7 +293,7 @@ module Api
     # 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)
     # 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, :params => { :id => way_id }
+      get api_way_history_path(: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"
       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"


@@ -302,7 +302,7 @@ module Api
         history_way = Way.from_xml_node(way_doc)
         assert_not_nil history_way, "parsing way #{way_id} version failed"
 
         history_way = Way.from_xml_node(way_doc)
         assert_not_nil history_way, "parsing way #{way_id} version failed"
 

-        get :version, :params => { :id => way_id, :version => history_way.version }
+        get way_version_path(: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}"
         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}"


@@ -311,12 +311,12 @@ module Api
       end
     end
 
       end
     end
 

-    def do_redact_way(way, redaction)
-      get :version, :params => { :id => way.way_id, :version => way.version }
+    def do_redact_way(way, redaction, headers = {})
+      get way_version_path(: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
       assert_response :success, "should be able to get version #{way.version} of way #{way.way_id}."
 
       # now redact it

-      post :redact, :params => { :id => way.way_id, :version => way.version, :redaction => redaction.id }
+      post way_version_redact_path(:id => way.way_id, :version => way.version), :params => { :redaction => redaction.id }, :headers => headers

     end
 
     def propagate_tags(way, old_way)
     end
 
     def propagate_tags(way, old_way)