Move current version redaction tests above roles/scopes tests

[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 bd818c377499b0306875eb325564f612976a5b47..e879c42a962acad6b0765995b25511e825544dc9 100644 (file)
--- a/test/controllers/api/old_ways_controller_test.rb
+++ b/test/controllers/api/old_ways_controller_test.rb
@@ -167,6 +167,20 @@ module Api
       assert_response :forbidden, "Redacted way shouldn't be visible via the version API, even when logged in and passing flag."
     end
 
       assert_response :forbidden, "Redacted way shouldn't be visible via the version API, even when logged in and passing flag."
     end
 

+    def test_show_redacted_moderator
+      way = create(:way, :with_history, :version => 2)
+      way.old_ways.find_by(:version => 1).redact!(create(:redaction))
+      auth_header = bearer_authorization_header create(:moderator_user)
+
+      get api_way_version_path(way, 1), :headers => auth_header
+
+      assert_response :forbidden, "Redacted node should be gone for moderator, when flag not passed."
+
+      get api_way_version_path(way, 1, :show_redactions => "true"), :headers => auth_header
+
+      assert_response :success, "Redacted node should not be gone for moderator, when flag passed."
+    end
+

     ##
     # check that returned history is the same as getting all
     # versions of a way from the api.
     ##
     # check that returned history is the same as getting all
     # versions of a way from the api.


@@ -181,102 +195,81 @@ module Api
       check_history_equals_versions(way_with_versions.id)
     end
 
       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
-      way = create(:way, :with_history, :version => 4)
-      way_v3 = way.old_ways.find_by(:version => 3)
-
-      do_redact_way(way_v3, create(:redaction))
-      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
-      auth_header = bearer_authorization_header
-      way = create(:way, :with_history, :version => 4)
-      way_v3 = way.old_ways.find_by(:version => 3)
-
-      do_redact_way(way_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 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

+      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)
       auth_header = bearer_authorization_header create(:moderator_user)

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

 
 

-      do_redact_way(way_latest, create(:redaction), 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_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
     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])
       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_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
     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])
       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_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
     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])
       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_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
     end
 
     def test_redact_way_by_moderator_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(:moderator_user), :scopes => %w[write_redactions])
       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 => 4)
-      way_v3 = way.old_ways.find_by(:version => 3)
-      auth_header = bearer_authorization_header create(:moderator_user)
-
-      do_redact_way(way_v3, create(:redaction), auth_header)
-
-      assert_response :success, "should be OK to redact old version as moderator."
-      assert_predicate way_v3.reload, :redacted?
-
-      # check moderator can still see the redacted data, when passing
-      # the appropriate flag
-      get api_way_version_path(way_v3.way_id, way_v3.version), :headers => auth_header
-      assert_response :forbidden, "After redaction, node should be gone for moderator, when flag not passed."
-      get api_way_version_path(way_v3.way_id, way_v3.version, :show_redactions => "true"), :headers => auth_header
-      assert_response :success, "After redaction, node 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_way_is_redacted
-      way = create(:way, :with_history, :version => 4)
-      way_v3 = way.old_ways.find_by(:version => 3)
-      auth_header = bearer_authorization_header create(:moderator_user)

 
 

-      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
-      auth_header = bearer_authorization_header
+      post way_version_redact_path(*old_way.id), :params => { :redaction => redaction.id }, :headers => auth_header

 
 

-      # check can't see the redacted data
-      get api_way_version_path(way_v3.way_id, way_v3.version), :headers => auth_header
-      assert_response :forbidden, "Redacted node shouldn't be visible via the version API."
+      assert_response :success, "should be OK to redact old version as moderator with write_redactions scope."
+      assert_equal redaction, old_way.reload.redaction

     end
 
     ##
     end
 
     ##


@@ -284,11 +277,14 @@ module Api
     # authorised.
     def test_unredact_way_unauthorised
       way = create(:way, :with_history, :version => 2)
     # authorised.
     def test_unredact_way_unauthorised
       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)
+      redaction = create(:redaction)
+      old_way.redact!(redaction)
+
+      post way_version_redact_path(*old_way.id)

 
 

-      post way_version_redact_path(way_v1.way_id, way_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_way.reload.redaction

     end
 
     ##
     end
 
     ##


@@ -296,13 +292,15 @@ module Api
     # authorised as a normal user.
     def test_unredact_way_normal_user
       way = create(:way, :with_history, :version => 2)
     # 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)
-      way_v1.redact!(create(:redaction))
-
+      old_way = way.old_ways.find_by(:version => 1)
+      redaction = create(:redaction)
+      old_way.redact!(redaction)

       auth_header = bearer_authorization_header
 
       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_response :forbidden, "should need to be moderator to unredact."

+      assert_equal redaction, old_way.reload.redaction

     end
 
     ##
     end
 
     ##


@@ -311,36 +309,14 @@ module Api
     def test_unredact_way_moderator
       moderator_user = create(:moderator_user)
       way = create(:way, :with_history, :version => 2)
     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
 
       auth_header = bearer_authorization_header moderator_user
 

-      post way_version_redact_path(way_v1.way_id, 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
-      get api_way_version_path(way_v1.way_id, way_v1.version), :headers => auth_header
-      assert_response :success, "After unredaction, node should not be gone for moderator."
-
-      # and when accessed via history
-      get api_way_versions_path(way), :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."
-
-      auth_header = bearer_authorization_header
-
-      # check normal user can now see the unredacted data
-      get api_way_version_path(way_v1.way_id, way_v1.version), :headers => auth_header
-      assert_response :success, "After redaction, node should not be gone for moderator, when flag passed."
+      post way_version_redact_path(*old_way.id), :headers => auth_header

 
 

-      # and when accessed via history
-      get api_way_versions_path(way), :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."
+      assert_response :success, "should be OK to unredact old version as moderator."
+      assert_nil old_way.reload.redaction

     end
 
     private
     end
 
     private


@@ -366,19 +342,5 @@ module Api
         assert_ways_are_equal history_way, version_way
       end
     end
         assert_ways_are_equal history_way, version_way
       end
     end

-
-    def do_redact_redactable_way(headers = {})
-      way = create(:way, :with_history, :version => 4)
-      way_v3 = way.old_ways.find_by(:version => 3)
-      do_redact_way(way_v3, create(:redaction), headers)
-    end
-
-    def do_redact_way(way, redaction, headers = {})
-      get api_way_version_path(way.way_id, way.version)
-      assert_response :success, "should be able to get version #{way.version} of way #{way.way_id}."
-
-      # now redact it
-      post way_version_redact_path(way.way_id, way.version), :params => { :redaction => redaction.id }, :headers => headers
-    end

   end
 end
   end
 end