X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef9d39ece0cc0e455e9494d81cef4f9e185cafdc..9929c1b585bd0e0b088cc785af06720d46f2dcce:/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 d7e6091ca..31b66ae8b 100644
--- a/test/controllers/api/old_ways_controller_test.rb
+++ b/test/controllers/api/old_ways_controller_test.rb
@@ -21,10 +21,6 @@ module Api
         { :path => "/api/0.6/way/1/2.json", :method => :get },
         { :controller => "api/old_ways", :action => "show", :way_id => "1", :version => "2", :format => "json" }
       )
-      assert_routing(
-        { :path => "/api/0.6/way/1/2/redact", :method => :post },
-        { :controller => "api/old_ways", :action => "redact", :way_id => "1", :version => "2" }
-      )
     end
 
     ##
@@ -195,140 +191,6 @@ 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)
-      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
-
-      assert_response :bad_request, "shouldn't be OK to redact current version as moderator."
-    end
-
-    def test_redact_way_by_regular_without_write_redactions_scope
-      auth_header = bearer_authorization_header(create(:user), :scopes => %w[read_prefs write_api])
-      do_redact_redactable_way(auth_header)
-      assert_response :forbidden, "should need to be moderator to redact."
-    end
-
-    def test_redact_way_by_regular_with_write_redactions_scope
-      auth_header = bearer_authorization_header(create(:user), :scopes => %w[write_redactions])
-      do_redact_redactable_way(auth_header)
-      assert_response :forbidden, "should need to be moderator to redact."
-    end
-
-    def test_redact_way_by_moderator_without_write_redactions_scope
-      auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[read_prefs write_api])
-      do_redact_redactable_way(auth_header)
-      assert_response :forbidden, "should need to have write_redactions scope to redact."
-    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)
-      redaction = create(:redaction)
-      auth_header = bearer_authorization_header create(:moderator_user)
-
-      post way_version_redact_path(*way_v1.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
-    end
-
-    ##
-    # test the unredaction of an old version of a way, while not being
-    # 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))
-
-      post way_version_redact_path(way_v1.way_id, way_v1.version)
-      assert_response :unauthorized, "should need to be authenticated to unredact."
-    end
-
-    ##
-    # test the unredaction of an old version of a way, while being
-    # 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))
-
-      auth_header = bearer_authorization_header
-
-      post way_version_redact_path(way_v1.way_id, way_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 way, while being
-    # authorised as a moderator.
-    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))
-
-      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."
-
-      # 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."
-    end
-
     private
 
     ##
@@ -352,12 +214,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