Merge pull request #5690 from tomhughes/ruby34

[rails.git] / 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 e03b55260156ba34835af9b9ca47f21d5bf1e0e3..603499503b20eafef0411adbde301ccd8543f6ea 100644 (file)
--- a/test/controllers/api/old_relations_controller_test.rb
+++ b/test/controllers/api/old_relations_controller_test.rb
@@ -184,74 +184,81 @@ module Api
       assert_response :success, "Redacted relation should not be gone for moderator, when flag passed."
     end
 
       assert_response :success, "Redacted relation should not be gone for moderator, when flag passed."
     end
 

-    ##
-    # test the redaction of an old version of a relation, while not being
-    # authorised.
-    def test_redact_relation_unauthorised
-      do_redact_redactable_relation
-      assert_response :unauthorized, "should need to be authenticated to redact."
-    end
-
-    ##
-    # test the redaction of an old version of a relation, while being
-    # authorised as a normal user.
-    def test_redact_relation_normal_user
-      do_redact_redactable_relation bearer_authorization_header
-      assert_response :forbidden, "should need to be moderator to redact."
-    end
-

     ##
     # test that, even as moderator, the current version of a relation
     # can't be redacted.
     def test_redact_relation_current_version
     ##
     # 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 = 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)
 
       redaction = create(:redaction)
       auth_header = bearer_authorization_header create(:moderator_user)
 

-      post relation_version_redact_path(relation, 4), :params => { :redaction => redaction.id }, :headers => 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_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
     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])
       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_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
     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])
       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_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
     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])
       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_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
     end
 
     def test_redact_relation_by_moderator_with_write_redactions_scope

-      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)
+      relation = create(:relation, :with_history, :version => 2)
+      old_relation = relation.old_relations.find_by(:version => 1)

       redaction = create(:redaction)
       redaction = create(:redaction)

-      auth_header = bearer_authorization_header create(:moderator_user)
+      auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[write_redactions])

 
 

-      post relation_version_redact_path(*relation_v3.id), :params => { :redaction => redaction.id }, :headers => auth_header
+      post relation_version_redact_path(*old_relation.id), :params => { :redaction => redaction.id }, :headers => auth_header

 
 

-      assert_response :success, "should be OK to redact old version as moderator."
-      relation_v3.reload
-      assert_predicate relation_v3, :redacted?
-      assert_equal redaction, relation_v3.redaction
+      assert_response :success, "should be OK to redact old version as moderator with write_redactions scope."
+      assert_equal redaction, old_relation.reload.redaction

     end
 
     ##
     end
 
     ##


@@ -259,11 +266,14 @@ module Api
     # authorised.
     def test_unredact_relation_unauthorised
       relation = create(:relation, :with_history, :version => 2)
     # 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_response :unauthorized, "should need to be authenticated to unredact."

+      assert_equal redaction, old_relation.reload.redaction

     end
 
     ##
     end
 
     ##


@@ -271,13 +281,15 @@ module Api
     # authorised as a normal user.
     def test_unredact_relation_normal_user
       relation = create(:relation, :with_history, :version => 2)
     # 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
 
       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_response :forbidden, "should need to be moderator to unredact."

+      assert_equal redaction, old_relation.reload.redaction

     end
 
     ##
     end
 
     ##


@@ -285,45 +297,14 @@ module Api
     # authorised as a moderator.
     def test_unredact_relation_moderator
       relation = create(:relation, :with_history, :version => 2)
     # 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)
 
       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."
-
-      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."
+      post relation_version_redact_path(*old_relation.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_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)
-      redaction = create(:redaction)
-
-      post relation_version_redact_path(relation, 3), :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
     end
   end
 end