X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/41e93bfb66f93fb6a2de42ee00e6b0f28f6b3e08..9929c1b585bd0e0b088cc785af06720d46f2dcce:/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 6946d2ab1..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,129 +191,6 @@ module Api
       check_history_equals_versions(way_with_versions.id)
     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)
-      old_way = way.old_ways.find_by(:version => 2)
-      redaction = create(:redaction)
-      auth_header = bearer_authorization_header create(:moderator_user)
-
-      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_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
-      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])
-
-      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_nil old_way.reload.redaction
-    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])
-
-      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_nil old_way.reload.redaction
-    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])
-
-      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_nil old_way.reload.redaction
-    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])
-
-      post way_version_redact_path(*old_way.id), :params => { :redaction => redaction.id }, :headers => auth_header
-
-      assert_response :success, "should be OK to redact old version as moderator with write_redactions scope."
-      assert_equal redaction, old_way.reload.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)
-      old_way = way.old_ways.find_by(:version => 1)
-      redaction = create(:redaction)
-      old_way.redact!(redaction)
-
-      post way_version_redact_path(*old_way.id)
-
-      assert_response :unauthorized, "should need to be authenticated to unredact."
-      assert_equal redaction, old_way.reload.redaction
-    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)
-      old_way = way.old_ways.find_by(:version => 1)
-      redaction = create(:redaction)
-      old_way.redact!(redaction)
-      auth_header = bearer_authorization_header
-
-      post way_version_redact_path(*old_way.id), :headers => auth_header
-
-      assert_response :forbidden, "should need to be moderator to unredact."
-      assert_equal redaction, old_way.reload.redaction
-    end
-
-    ##
-    # test the unredaction of an old version of a way, while being
-    # authorised as a moderator.
-    def test_unredact_way_moderator
-      way = create(:way, :with_history, :version => 2)
-      old_way = way.old_ways.find_by(:version => 1)
-      old_way.redact!(create(:redaction))
-      auth_header = bearer_authorization_header create(:moderator_user)
-
-      post way_version_redact_path(*old_way.id), :headers => auth_header
-
-      assert_response :success, "should be OK to unredact old version as moderator."
-      assert_nil old_way.reload.redaction
-    end
-
     private
 
     ##