X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0063727434d240528d72cbeabae9cb4d46cd6b15..319c9af97553f2a37d10097bf1017740ebfdbf12:/test/controllers/api/old_ways_controller_test.rb?ds=sidebyside

diff --git a/test/controllers/api/old_ways_controller_test.rb b/test/controllers/api/old_ways_controller_test.rb
index 5dc1c9cfc..e879c42a9 100644
--- a/test/controllers/api/old_ways_controller_test.rb
+++ b/test/controllers/api/old_ways_controller_test.rb
@@ -195,74 +195,81 @@ module Api
       check_history_equals_versions(way_with_versions.id)
     end
 
-    ##
-    # test the redaction of an old version of a way, while not being
-    # authorised.
-    def test_redact_way_unauthorised
-      do_redact_redactable_way
-      assert_response :unauthorized, "should need to be authenticated to redact."
-    end
-
-    ##
-    # test the redaction of an old version of a way, while being
-    # authorised as a normal user.
-    def test_redact_way_normal_user
-      do_redact_redactable_way bearer_authorization_header
-      assert_response :forbidden, "should need to be moderator to redact."
-    end
-
     ##
     # test that, even as moderator, the current version of a way
     # can't be redacted.
     def test_redact_way_current_version
       way = create(:way, :with_history, :version => 2)
+      old_way = way.old_ways.find_by(:version => 2)
       redaction = create(:redaction)
       auth_header = bearer_authorization_header create(:moderator_user)
 
-      post way_version_redact_path(way, 2), :params => { :redaction => redaction.id }, :headers => auth_header
+      post way_version_redact_path(*old_way.id), :params => { :redaction => redaction.id }, :headers => auth_header
 
       assert_response :bad_request, "shouldn't be OK to redact current version as moderator."
+      assert_nil old_way.reload.redaction
+    end
+
+    ##
+    # test the redaction of an old version of a way, while not being
+    # authorised.
+    def test_redact_way_unauthorised
+      way = create(:way, :with_history, :version => 2)
+      old_way = way.old_ways.find_by(:version => 1)
+      redaction = create(:redaction)
+
+      post way_version_redact_path(*old_way.id), :params => { :redaction => redaction.id }
+
+      assert_response :unauthorized, "should need to be authenticated to redact."
+      assert_nil old_way.reload.redaction
     end
 
     def test_redact_way_by_regular_without_write_redactions_scope
+      way = create(:way, :with_history, :version => 2)
+      old_way = way.old_ways.find_by(:version => 1)
+      redaction = create(:redaction)
       auth_header = bearer_authorization_header(create(:user), :scopes => %w[read_prefs write_api])
-      do_redact_redactable_way(auth_header)
+
+      post way_version_redact_path(*old_way.id), :params => { :redaction => redaction.id }, :headers => auth_header
+
       assert_response :forbidden, "should need to be moderator to redact."
+      assert_nil old_way.reload.redaction
     end
 
     def test_redact_way_by_regular_with_write_redactions_scope
+      way = create(:way, :with_history, :version => 2)
+      old_way = way.old_ways.find_by(:version => 1)
+      redaction = create(:redaction)
       auth_header = bearer_authorization_header(create(:user), :scopes => %w[write_redactions])
-      do_redact_redactable_way(auth_header)
+
+      post way_version_redact_path(*old_way.id), :params => { :redaction => redaction.id }, :headers => auth_header
+
       assert_response :forbidden, "should need to be moderator to redact."
+      assert_nil old_way.reload.redaction
     end
 
     def test_redact_way_by_moderator_without_write_redactions_scope
+      way = create(:way, :with_history, :version => 2)
+      old_way = way.old_ways.find_by(:version => 1)
+      redaction = create(:redaction)
       auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[read_prefs write_api])
-      do_redact_redactable_way(auth_header)
+
+      post way_version_redact_path(*old_way.id), :params => { :redaction => redaction.id }, :headers => auth_header
+
       assert_response :forbidden, "should need to have write_redactions scope to redact."
+      assert_nil old_way.reload.redaction
     end
 
     def test_redact_way_by_moderator_with_write_redactions_scope
-      auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[write_redactions])
-      do_redact_redactable_way(auth_header)
-      assert_response :success, "should be OK to redact old version as moderator with write_redactions scope."
-    end
-
-    ##
-    # test the redaction of an old version of a way, while being
-    # authorised as a moderator.
-    def test_redact_way_moderator
       way = create(:way, :with_history, :version => 2)
-      way_v1 = way.old_ways.find_by(:version => 1)
+      old_way = way.old_ways.find_by(:version => 1)
       redaction = create(:redaction)
-      auth_header = bearer_authorization_header create(:moderator_user)
+      auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[write_redactions])
 
-      post way_version_redact_path(*way_v1.id), :params => { :redaction => redaction.id }, :headers => auth_header
+      post way_version_redact_path(*old_way.id), :params => { :redaction => redaction.id }, :headers => auth_header
 
-      assert_response :success, "should be OK to redact old version as moderator."
-      way_v1.reload
-      assert_predicate way_v1, :redacted?
-      assert_equal redaction, way_v1.redaction
+      assert_response :success, "should be OK to redact old version as moderator with write_redactions scope."
+      assert_equal redaction, old_way.reload.redaction
     end
 
     ##
@@ -270,14 +277,14 @@ module Api
     # authorised.
     def test_unredact_way_unauthorised
       way = create(:way, :with_history, :version => 2)
-      way_v1 = way.old_ways.find_by(:version => 1)
+      old_way = way.old_ways.find_by(:version => 1)
       redaction = create(:redaction)
-      way_v1.redact!(redaction)
+      old_way.redact!(redaction)
 
-      post way_version_redact_path(way_v1.way_id, way_v1.version)
+      post way_version_redact_path(*old_way.id)
 
       assert_response :unauthorized, "should need to be authenticated to unredact."
-      assert_equal redaction, way_v1.reload.redaction
+      assert_equal redaction, old_way.reload.redaction
     end
 
     ##
@@ -285,15 +292,15 @@ module Api
     # authorised as a normal user.
     def test_unredact_way_normal_user
       way = create(:way, :with_history, :version => 2)
-      way_v1 = way.old_ways.find_by(:version => 1)
+      old_way = way.old_ways.find_by(:version => 1)
       redaction = create(:redaction)
-      way_v1.redact!(redaction)
+      old_way.redact!(redaction)
       auth_header = bearer_authorization_header
 
-      post way_version_redact_path(way_v1.way_id, way_v1.version), :headers => auth_header
+      post way_version_redact_path(*old_way.id), :headers => auth_header
 
       assert_response :forbidden, "should need to be moderator to unredact."
-      assert_equal redaction, way_v1.reload.redaction
+      assert_equal redaction, old_way.reload.redaction
     end
 
     ##
@@ -302,14 +309,14 @@ module Api
     def test_unredact_way_moderator
       moderator_user = create(:moderator_user)
       way = create(:way, :with_history, :version => 2)
-      way_v1 = way.old_ways.find_by(:version => 1)
-      way_v1.redact!(create(:redaction))
+      old_way = way.old_ways.find_by(:version => 1)
+      old_way.redact!(create(:redaction))
       auth_header = bearer_authorization_header moderator_user
 
-      post way_version_redact_path(way_v1.way_id, way_v1.version), :headers => auth_header
+      post way_version_redact_path(*old_way.id), :headers => auth_header
 
       assert_response :success, "should be OK to unredact old version as moderator."
-      assert_nil way_v1.reload.redaction
+      assert_nil old_way.reload.redaction
     end
 
     private
@@ -335,12 +342,5 @@ module Api
         assert_ways_are_equal history_way, version_way
       end
     end
-
-    def do_redact_redactable_way(headers = {})
-      way = create(:way, :with_history, :version => 2)
-      redaction = create(:redaction)
-
-      post way_version_redact_path(way.id, 1), :params => { :redaction => redaction.id }, :headers => headers
-    end
   end
 end