From fb493cde5806ca2ed7fd381429ce505769b67d00 Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Sat, 3 May 2025 07:21:57 +0300
Subject: [PATCH] Move api changeset upload unknown action test

---
 .../api/changesets/uploads_controller_test.rb | 21 +++++++++++++++++++
 .../api/changesets_controller_test.rb         | 19 -----------------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/test/controllers/api/changesets/uploads_controller_test.rb b/test/controllers/api/changesets/uploads_controller_test.rb
index 2164d52ba..3634de87c 100644
--- a/test/controllers/api/changesets/uploads_controller_test.rb
+++ b/test/controllers/api/changesets/uploads_controller_test.rb
@@ -125,6 +125,27 @@ module Api
         assert_equal 1 * GeoRecord::SCALE, node.longitude
       end
 
+      ##
+      # try to upload with commands other than create, modify, or delete
+      def test_upload_unknown_action
+        changeset = create(:changeset)
+
+        diff = <<~CHANGESET
+          <osmChange>
+            <ping>
+              <node id='1' lon='1' lat='1' changeset='#{changeset.id}' />
+            </ping>
+          </osmChange>
+        CHANGESET
+
+        auth_header = bearer_authorization_header changeset.user
+
+        post api_changeset_upload_path(changeset), :params => diff, :headers => auth_header
+
+        assert_response :bad_request
+        assert_equal "Unknown action ping, choices are create, modify, delete", @response.body
+      end
+
       # -------------------------------------
       # Test creating elements.
       # -------------------------------------
diff --git a/test/controllers/api/changesets_controller_test.rb b/test/controllers/api/changesets_controller_test.rb
index c81be9ae1..aa2bf2c9f 100644
--- a/test/controllers/api/changesets_controller_test.rb
+++ b/test/controllers/api/changesets_controller_test.rb
@@ -769,25 +769,6 @@ module Api
       end
     end
 
-    ##
-    # try to upload with commands other than create, modify, or delete
-    def test_action_upload_invalid
-      changeset = create(:changeset)
-
-      auth_header = bearer_authorization_header changeset.user
-
-      diff = <<~CHANGESET
-        <osmChange>
-          <ping>
-           <node id='1' lon='1' lat='1' changeset='#{changeset.id}' />
-          </ping>
-        </osmChange>
-      CHANGESET
-      post api_changeset_upload_path(changeset), :params => diff, :headers => auth_header
-      assert_response :bad_request, "Shouldn't be able to upload a diff with the action ping"
-      assert_equal("Unknown action ping, choices are create, modify, delete", @response.body)
-    end
-
     ##
     # test that a placeholder can be reused within the same upload.
     def test_upload_reuse_placeholder_valid
-- 
2.39.5