X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d0c68c404147f36e92fdfe0d219c7e2bd6dfa6bb..4485cae913bbb7c138aa435bf0ecfd8d8f6f5095:/test/controllers/api/old_relations_controller_test.rb

diff --git a/test/controllers/api/old_relations_controller_test.rb b/test/controllers/api/old_relations_controller_test.rb
index 75fa5c77a..603499503 100644
--- a/test/controllers/api/old_relations_controller_test.rb
+++ b/test/controllers/api/old_relations_controller_test.rb
@@ -89,6 +89,24 @@ module Api
                  "redacted relation #{relation.id} version 1 shouldn't be present in the history, even when logged in and passing flag."
     end
 
+    def test_index_redacted_moderator
+      relation = create(:relation, :with_history, :version => 2)
+      relation.old_relations.find_by(:version => 1).redact!(create(:redaction))
+      auth_header = bearer_authorization_header create(:moderator_user)
+
+      get api_relation_versions_path(relation), :headers => auth_header
+
+      assert_response :success, "Redaction shouldn't have stopped history working."
+      assert_dom "osm relation[id='#{relation.id}'][version='1']", 0,
+                 "relation #{relation.id} version 1 should not be present in the history for moderators when not passing flag."
+
+      get api_relation_versions_path(relation, :show_redactions => "true"), :headers => auth_header
+
+      assert_response :success, "Redaction shouldn't have stopped history working."
+      assert_dom "osm relation[id='#{relation.id}'][version='1']", 1,
+                 "relation #{relation.id} version 1 should still be present in the history for moderators when passing flag."
+    end
+
     def test_show
       relation = create(:relation, :with_history, :version => 2)
       create(:old_relation_tag, :old_relation => relation.old_relations[0], :k => "k1", :v => "v1")
@@ -133,6 +151,10 @@ module Api
       get api_relation_version_path(relation, 1)
 
       assert_response :forbidden, "Redacted relation shouldn't be visible via the version API."
+
+      get api_relation_version_path(relation, 1, :show_redactions => "true")
+
+      assert_response :forbidden, "Redacted relation shouldn't be visible via the version API when passing flag."
     end
 
     def test_show_redacted_normal_user
@@ -142,124 +164,101 @@ module Api
       get api_relation_version_path(relation, 1), :headers => bearer_authorization_header
 
       assert_response :forbidden, "Redacted relation shouldn't be visible via the version API, even when logged in."
-    end
 
-    ##
-    # test the redaction of an old version of a relation, while not being
-    # authorised.
-    def test_redact_relation_unauthorised
-      relation = create(:relation, :with_history, :version => 4)
-      relation_v3 = relation.old_relations.find_by(:version => 3)
+      get api_relation_version_path(relation, 1, :show_redactions => "true"), :headers => bearer_authorization_header
 
-      do_redact_relation(relation_v3, create(:redaction))
-      assert_response :unauthorized, "should need to be authenticated to redact."
+      assert_response :forbidden, "Redacted relation shouldn't be visible via the version API, even when logged in and passing flag."
     end
 
-    ##
-    # test the redaction of an old version of a relation, while being
-    # authorised as a normal user.
-    def test_redact_relation_normal_user
-      relation = create(:relation, :with_history, :version => 4)
-      relation_v3 = relation.old_relations.find_by(:version => 3)
+    def test_show_redacted_moderator
+      relation = create(:relation, :with_history, :version => 2)
+      relation.old_relations.find_by(:version => 1).redact!(create(:redaction))
+      auth_header = bearer_authorization_header create(:moderator_user)
 
-      auth_header = bearer_authorization_header
+      get api_relation_version_path(relation, 1), :headers => auth_header
 
-      do_redact_relation(relation_v3, create(:redaction), auth_header)
-      assert_response :forbidden, "should need to be moderator to redact."
+      assert_response :forbidden, "Redacted relation should be gone for moderator, when flag not passed."
+
+      get api_relation_version_path(relation, 1, :show_redactions => "true"), :headers => auth_header
+
+      assert_response :success, "Redacted relation should not be gone for moderator, when flag passed."
     end
 
     ##
     # test that, even as moderator, the current version of a relation
     # can't be redacted.
     def test_redact_relation_current_version
-      relation = create(:relation, :with_history, :version => 4)
-      relation_latest = relation.old_relations.last
-
+      relation = create(:relation, :with_history, :version => 2)
+      old_relation = relation.old_relations.find_by(:version => 2)
+      redaction = create(:redaction)
       auth_header = bearer_authorization_header create(:moderator_user)
 
-      do_redact_relation(relation_latest, create(:redaction), auth_header)
+      post relation_version_redact_path(*old_relation.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_relation.reload.redaction
+    end
+
+    ##
+    # test the redaction of an old version of a relation, while not being
+    # authorised.
+    def test_redact_relation_unauthorised
+      relation = create(:relation, :with_history, :version => 2)
+      old_relation = relation.old_relations.find_by(:version => 1)
+      redaction = create(:redaction)
+
+      post relation_version_redact_path(*old_relation.id), :params => { :redaction => redaction.id }
+
+      assert_response :unauthorized, "should need to be authenticated to redact."
+      assert_nil old_relation.reload.redaction
     end
 
     def test_redact_relation_by_regular_without_write_redactions_scope
+      relation = create(:relation, :with_history, :version => 2)
+      old_relation = relation.old_relations.find_by(:version => 1)
+      redaction = create(:redaction)
       auth_header = bearer_authorization_header(create(:user), :scopes => %w[read_prefs write_api])
-      do_redact_redactable_relation(auth_header)
+
+      post relation_version_redact_path(*old_relation.id), :params => { :redaction => redaction.id }, :headers => auth_header
+
       assert_response :forbidden, "should need to be moderator to redact."
+      assert_nil old_relation.reload.redaction
     end
 
     def test_redact_relation_by_regular_with_write_redactions_scope
+      relation = create(:relation, :with_history, :version => 2)
+      old_relation = relation.old_relations.find_by(:version => 1)
+      redaction = create(:redaction)
       auth_header = bearer_authorization_header(create(:user), :scopes => %w[write_redactions])
-      do_redact_redactable_relation(auth_header)
+
+      post relation_version_redact_path(*old_relation.id), :params => { :redaction => redaction.id }, :headers => auth_header
+
       assert_response :forbidden, "should need to be moderator to redact."
+      assert_nil old_relation.reload.redaction
     end
 
     def test_redact_relation_by_moderator_without_write_redactions_scope
+      relation = create(:relation, :with_history, :version => 2)
+      old_relation = relation.old_relations.find_by(:version => 1)
+      redaction = create(:redaction)
       auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[read_prefs write_api])
-      do_redact_redactable_relation(auth_header)
+
+      post relation_version_redact_path(*old_relation.id), :params => { :redaction => redaction.id }, :headers => auth_header
+
       assert_response :forbidden, "should need to have write_redactions scope to redact."
+      assert_nil old_relation.reload.redaction
     end
 
     def test_redact_relation_by_moderator_with_write_redactions_scope
+      relation = create(:relation, :with_history, :version => 2)
+      old_relation = relation.old_relations.find_by(:version => 1)
+      redaction = create(:redaction)
       auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[write_redactions])
-      do_redact_redactable_relation(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 relation, while being
-    # authorised as a moderator.
-    def test_redact_relation_moderator
-      relation = create(:relation, :with_history, :version => 4)
-      relation_v3 = relation.old_relations.find_by(:version => 3)
-
-      auth_header = bearer_authorization_header create(:moderator_user)
-
-      do_redact_relation(relation_v3, create(:redaction), auth_header)
-
-      assert_response :success, "should be OK to redact old version as moderator."
-      assert_predicate relation_v3.reload, :redacted?
-
-      # check moderator can still see the redacted data, when passing
-      # the appropriate flag
-      get api_relation_version_path(relation_v3.relation_id, relation_v3.version), :headers => auth_header
-      assert_response :forbidden, "After redaction, relation should be gone for moderator, when flag not passed."
-      get api_relation_version_path(relation_v3.relation_id, relation_v3.version, :show_redactions => "true"), :headers => auth_header
-      assert_response :success, "After redaction, relation should not be gone for moderator, when flag passed."
-
-      # and when accessed via history
-      get api_relation_versions_path(relation), :headers => auth_header
-      assert_response :success, "Redaction shouldn't have stopped history working."
-      assert_select "osm relation[id='#{relation_v3.relation_id}'][version='#{relation_v3.version}']", 0,
-                    "relation #{relation_v3.relation_id} version #{relation_v3.version} should not be present in the history for moderators when not passing flag."
-      get api_relation_versions_path(relation, :show_redactions => "true"), :headers => auth_header
-      assert_response :success, "Redaction shouldn't have stopped history working."
-      assert_select "osm relation[id='#{relation_v3.relation_id}'][version='#{relation_v3.version}']", 1,
-                    "relation #{relation_v3.relation_id} version #{relation_v3.version} should still be present in the history for moderators when passing flag."
-    end
-
-    # testing that if the moderator drops auth, he can't see the
-    # redacted stuff any more.
-    def test_redact_relation_is_redacted
-      relation = create(:relation, :with_history, :version => 4)
-      relation_v3 = relation.old_relations.find_by(:version => 3)
-
-      auth_header = bearer_authorization_header create(:moderator_user)
-
-      do_redact_relation(relation_v3, create(:redaction), auth_header)
-      assert_response :success, "should be OK to redact old version as moderator."
-
-      # re-auth as non-moderator
-      auth_header = bearer_authorization_header
 
-      # check can't see the redacted data
-      get api_relation_version_path(relation_v3.relation_id, relation_v3.version), :headers => auth_header
-      assert_response :forbidden, "Redacted relation shouldn't be visible via the version API."
+      post relation_version_redact_path(*old_relation.id), :params => { :redaction => redaction.id }, :headers => auth_header
 
-      # and when accessed via history
-      get api_relation_versions_path(relation), :headers => auth_header
-      assert_response :success, "Redaction shouldn't have stopped history working."
-      assert_select "osm relation[id='#{relation_v3.relation_id}'][version='#{relation_v3.version}']", 0,
-                    "redacted relation #{relation_v3.relation_id} version #{relation_v3.version} shouldn't be present in the history."
+      assert_response :success, "should be OK to redact old version as moderator with write_redactions scope."
+      assert_equal redaction, old_relation.reload.redaction
     end
 
     ##
@@ -267,11 +266,14 @@ module Api
     # authorised.
     def test_unredact_relation_unauthorised
       relation = create(:relation, :with_history, :version => 2)
-      relation_v1 = relation.old_relations.find_by(:version => 1)
-      relation_v1.redact!(create(:redaction))
+      old_relation = relation.old_relations.find_by(:version => 1)
+      redaction = create(:redaction)
+      old_relation.redact!(redaction)
+
+      post relation_version_redact_path(*old_relation.id)
 
-      post relation_version_redact_path(relation_v1.relation_id, relation_v1.version)
       assert_response :unauthorized, "should need to be authenticated to unredact."
+      assert_equal redaction, old_relation.reload.redaction
     end
 
     ##
@@ -279,13 +281,15 @@ module Api
     # authorised as a normal user.
     def test_unredact_relation_normal_user
       relation = create(:relation, :with_history, :version => 2)
-      relation_v1 = relation.old_relations.find_by(:version => 1)
-      relation_v1.redact!(create(:redaction))
-
+      old_relation = relation.old_relations.find_by(:version => 1)
+      redaction = create(:redaction)
+      old_relation.redact!(redaction)
       auth_header = bearer_authorization_header
 
-      post relation_version_redact_path(relation_v1.relation_id, relation_v1.version), :headers => auth_header
+      post relation_version_redact_path(*old_relation.id), :headers => auth_header
+
       assert_response :forbidden, "should need to be moderator to unredact."
+      assert_equal redaction, old_relation.reload.redaction
     end
 
     ##
@@ -293,52 +297,14 @@ module Api
     # authorised as a moderator.
     def test_unredact_relation_moderator
       relation = create(:relation, :with_history, :version => 2)
-      relation_v1 = relation.old_relations.find_by(:version => 1)
-      relation_v1.redact!(create(:redaction))
-
+      old_relation = relation.old_relations.find_by(:version => 1)
+      old_relation.redact!(create(:redaction))
       auth_header = bearer_authorization_header create(:moderator_user)
 
-      post relation_version_redact_path(relation_v1.relation_id, relation_v1.version), :headers => auth_header
-      assert_response :success, "should be OK to unredact old version as moderator."
-
-      # check moderator can still see the redacted data, without passing
-      # the appropriate flag
-      get api_relation_version_path(relation_v1.relation_id, relation_v1.version), :headers => auth_header
-      assert_response :success, "After unredaction, relation should not be gone for moderator."
-
-      # and when accessed via history
-      get api_relation_versions_path(relation), :headers => auth_header
-      assert_response :success, "Redaction shouldn't have stopped history working."
-      assert_select "osm relation[id='#{relation_v1.relation_id}'][version='#{relation_v1.version}']", 1,
-                    "relation #{relation_v1.relation_id} version #{relation_v1.version} should still be present in the history for moderators."
+      post relation_version_redact_path(*old_relation.id), :headers => auth_header
 
-      auth_header = bearer_authorization_header
-
-      # check normal user can now see the redacted data
-      get api_relation_version_path(relation_v1.relation_id, relation_v1.version), :headers => auth_header
-      assert_response :success, "After redaction, node should not be gone for normal user."
-
-      # and when accessed via history
-      get api_relation_versions_path(relation), :headers => auth_header
-      assert_response :success, "Redaction shouldn't have stopped history working."
-      assert_select "osm relation[id='#{relation_v1.relation_id}'][version='#{relation_v1.version}']", 1,
-                    "relation #{relation_v1.relation_id} version #{relation_v1.version} should still be present in the history for normal users."
-    end
-
-    private
-
-    def do_redact_redactable_relation(headers = {})
-      relation = create(:relation, :with_history, :version => 4)
-      relation_v3 = relation.old_relations.find_by(:version => 3)
-      do_redact_relation(relation_v3, create(:redaction), headers)
-    end
-
-    def do_redact_relation(relation, redaction, headers = {})
-      get api_relation_version_path(relation.relation_id, relation.version)
-      assert_response :success, "should be able to get version #{relation.version} of relation #{relation.relation_id}."
-
-      # now redact it
-      post relation_version_redact_path(relation.relation_id, relation.version), :params => { :redaction => redaction.id }, :headers => headers
+      assert_response :success, "should be OK to unredact old version as moderator."
+      assert_nil old_relation.reload.redaction
     end
   end
 end