Add show_redactions param to changeset downloads

[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 aac46ad6504744ecbe498a1ffea0834282ca24b4..50730c3786fa162d1d4f3ef0ddc47d4407e616e6 100644 (file)
--- a/test/controllers/api/old_relations_controller_test.rb
+++ b/test/controllers/api/old_relations_controller_test.rb
@@ -21,10 +21,6 @@ module Api
         { :path => "/api/0.6/relation/1/2.json", :method => :get },
         { :controller => "api/old_relations", :action => "show", :relation_id => "1", :version => "2", :format => "json" }
       )
         { :path => "/api/0.6/relation/1/2.json", :method => :get },
         { :controller => "api/old_relations", :action => "show", :relation_id => "1", :version => "2", :format => "json" }
       )

-      assert_routing(
-        { :path => "/api/0.6/relation/1/2/redact", :method => :post },
-        { :controller => "api/old_relations", :action => "redact", :relation_id => "1", :version => "2" }
-      )

     end
 
     ##
     end
 
     ##


@@ -151,6 +147,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)
 
       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
     end
 
     def test_show_redacted_normal_user


@@ -160,187 +160,24 @@ 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."
       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)
-
-      do_redact_relation(relation_v3, create(:redaction))
-      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
-      relation = create(:relation, :with_history, :version => 4)
-      relation_v3 = relation.old_relations.find_by(:version => 3)
-
-      auth_header = bearer_authorization_header
-
-      do_redact_relation(relation_v3, create(:redaction), auth_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
-      relation = create(:relation, :with_history, :version => 4)
-      relation_latest = relation.old_relations.last
-
-      auth_header = bearer_authorization_header create(:moderator_user)
-
-      do_redact_relation(relation_latest, create(:redaction), auth_header)
-      assert_response :bad_request, "shouldn't be OK to redact current version as moderator."
-    end
-
-    def test_redact_relation_by_regular_without_write_redactions_scope
-      auth_header = bearer_authorization_header(create(:user), :scopes => %w[read_prefs write_api])
-      do_redact_redactable_relation(auth_header)
-      assert_response :forbidden, "should need to be moderator to redact."
-    end
-
-    def test_redact_relation_by_regular_with_write_redactions_scope
-      auth_header = bearer_authorization_header(create(:user), :scopes => %w[write_redactions])
-      do_redact_redactable_relation(auth_header)
-      assert_response :forbidden, "should need to be moderator to redact."
-    end
-
-    def test_redact_relation_by_moderator_without_write_redactions_scope
-      auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[read_prefs write_api])
-      do_redact_redactable_relation(auth_header)
-      assert_response :forbidden, "should need to have write_redactions scope to redact."
-    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)
-
-      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."
-    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."
+      get api_relation_version_path(relation, 1, :show_redactions => "true"), :headers => bearer_authorization_header

 
 

-      # 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."
+      assert_response :forbidden, "Redacted relation shouldn't be visible via the version API, even when logged in and passing flag."

     end
 
     end
 

-    ##
-    # test the unredaction of an old version of a relation, while not being
-    # authorised.
-    def test_unredact_relation_unauthorised
+    def test_show_redacted_moderator

       relation = create(:relation, :with_history, :version => 2)
       relation = create(:relation, :with_history, :version => 2)

-      relation_v1 = relation.old_relations.find_by(:version => 1)
-      relation_v1.redact!(create(:redaction))
-
-      post relation_version_redact_path(relation_v1.relation_id, relation_v1.version)
-      assert_response :unauthorized, "should need to be authenticated to unredact."
-    end
-
-    ##
-    # test the unredaction of an old version of a relation, while being
-    # 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))
-
-      auth_header = bearer_authorization_header
-
-      post relation_version_redact_path(relation_v1.relation_id, relation_v1.version), :headers => auth_header
-      assert_response :forbidden, "should need to be moderator to unredact."
-    end
-
-    ##
-    # test the unredaction of an old version of a relation, while being
-    # 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))
-
+      relation.old_relations.find_by(:version => 1).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."
-
-      # 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
+      get api_relation_version_path(relation, 1), :headers => auth_header

 
 

-    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
+      assert_response :forbidden, "Redacted relation should be gone for moderator, when flag not passed."

 
 

-    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}."
+      get api_relation_version_path(relation, 1, :show_redactions => "true"), :headers => auth_header

 
 

-      # now redact it
-      post relation_version_redact_path(relation.relation_id, relation.version), :params => { :redaction => redaction.id }, :headers => headers
+      assert_response :success, "Redacted relation should not be gone for moderator, when flag passed."

     end
   end
 end
     end
   end
 end