From 948d5e2e36b79114772f2f0e8f40cd49f8ae8e3e Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Sun, 4 May 2025 02:10:42 +0300
Subject: [PATCH] Move api empty changeset upload test

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

diff --git a/test/controllers/api/changesets/uploads_controller_test.rb b/test/controllers/api/changesets/uploads_controller_test.rb
index c1370871f..dac7dff37 100644
--- a/test/controllers/api/changesets/uploads_controller_test.rb
+++ b/test/controllers/api/changesets/uploads_controller_test.rb
@@ -146,6 +146,23 @@ module Api
         assert_equal "Unknown action ping, choices are create, modify, delete", @response.body
       end
 
+      ##
+      # test for issues in https://github.com/openstreetmap/trac-tickets/issues/1568
+      def test_upload_empty_changeset
+        changeset = create(:changeset)
+
+        auth_header = bearer_authorization_header changeset.user
+
+        ["<osmChange/>",
+         "<osmChange></osmChange>",
+         "<osmChange><modify/></osmChange>",
+         "<osmChange><modify></modify></osmChange>"].each do |diff|
+          post api_changeset_upload_path(changeset), :params => diff, :headers => auth_header
+
+          assert_response :success
+        end
+      end
+
       # -------------------------------------
       # Test creating elements.
       # -------------------------------------
diff --git a/test/controllers/api/changesets_controller_test.rb b/test/controllers/api/changesets_controller_test.rb
index ed65c2f6d..691febb0e 100644
--- a/test/controllers/api/changesets_controller_test.rb
+++ b/test/controllers/api/changesets_controller_test.rb
@@ -787,24 +787,6 @@ module Api
       assert_equal 0.3 * GeoRecord::SCALE, changeset.max_lat, "max_lat should be 0.3 degrees"
     end
 
-    ##
-    # test for more issues in #1568
-    def test_upload_empty_invalid
-      changeset = create(:changeset)
-
-      auth_header = bearer_authorization_header changeset.user
-
-      ["<osmChange/>",
-       "<osmChange></osmChange>",
-       "<osmChange><modify/></osmChange>",
-       "<osmChange><modify></modify></osmChange>"].each do |diff|
-        # upload it
-        post api_changeset_upload_path(changeset), :params => diff, :headers => auth_header
-        assert_response(:success, "should be able to upload " \
-                                  "empty changeset: " + diff)
-      end
-    end
-
     ##
     # test that the X-Error-Format header works to request XML errors
     def test_upload_xml_errors
-- 
2.39.5