From: Tom Hughes <tom@compton.nu>
Date: Mon, 15 Jul 2024 18:19:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4993'
X-Git-Tag: live~862
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4a62dac9c06bcdb7c2acac75e9168bf654c4c64d?hp=6d5752ad623dc70d0d6a1004c42871fb05704c56

Merge remote-tracking branch 'upstream/pull/4993'
---

diff --git a/app/assets/images/banners/SOTMAsia_x_FOSS4G_2023.jpg b/app/assets/images/banners/SOTMAsia_x_FOSS4G_2023.jpg
deleted file mode 100644
index f4a498c1c..000000000
Binary files a/app/assets/images/banners/SOTMAsia_x_FOSS4G_2023.jpg and /dev/null differ
diff --git a/app/assets/images/banners/StateOfTheMapAfrica_2023.jpg b/app/assets/images/banners/StateOfTheMapAfrica_2023.jpg
deleted file mode 100644
index b2bf06209..000000000
Binary files a/app/assets/images/banners/StateOfTheMapAfrica_2023.jpg and /dev/null differ
diff --git a/app/assets/images/banners/StateOfTheMapAfrica_2023@2x.jpg b/app/assets/images/banners/StateOfTheMapAfrica_2023@2x.jpg
deleted file mode 100644
index d7d362ae7..000000000
Binary files a/app/assets/images/banners/StateOfTheMapAfrica_2023@2x.jpg and /dev/null differ
diff --git a/app/assets/images/banners/sotm_2024.png b/app/assets/images/banners/sotm_2024.png
new file mode 100644
index 000000000..6e0af8efc
Binary files /dev/null and b/app/assets/images/banners/sotm_2024.png differ
diff --git a/app/assets/images/banners/sotm_2024@2x.png b/app/assets/images/banners/sotm_2024@2x.png
new file mode 100644
index 000000000..e505e7f24
Binary files /dev/null and b/app/assets/images/banners/sotm_2024@2x.png differ
diff --git a/config/banners.yml b/config/banners.yml
index 2c8e1338a..1f2056194 100644
--- a/config/banners.yml
+++ b/config/banners.yml
@@ -14,20 +14,13 @@ sotmeu_2024:
   link: https://openstreetmap.org.pl/2024/sotm-eu-2024-community-tickets-70/
   img: banners/StateoftheMapEurope_2024.png
   enddate: 2024-jul-18
-sotmasia_2023:
-  id: sotmasia_2023
-  alt: State of the Map Asia x Foss4G Thailand 2023
-  link: https://stateofthemap.asia/
-  img: banners/SOTMAsia_x_FOSS4G_2023.jpg
-  startdate: 2023-oct-18
-  enddate: 2023-nov-18
-sotmafrica_2023:
-  id: sotmafrica_2023
-  alt: State of the Map Africa 2023
-  link: https://2023.stateofthemap.africa
-  img: banners/StateOfTheMapAfrica_2023.jpg
+sotm_2024:
+  id: sotm_2024
+  alt: State of the Map 2024
+  link: https://2024.stateofthemap.org
+  img: banners/sotm_2024.png
   srcset:
-    - [banners/StateOfTheMapAfrica_2023.jpg, 1x]
-    - [banners/StateOfTheMapAfrica_2023@2x.jpg, 2x]
-  startdate: 2023-oct-30
-  enddate: 2023-nov-30
+    - [banners/sotm_2024.png, 1x]
+    - [banners/sotm_2024@2x.png, 2x]
+  startdate: 2024-jul-10
+  enddate: 2024-sep-05
\ No newline at end of file
diff --git a/test/controllers/changeset_comments_controller_test.rb b/test/controllers/changeset_comments_controller_test.rb
index 5d0f4b51f..b03640eab 100644
--- a/test/controllers/changeset_comments_controller_test.rb
+++ b/test/controllers/changeset_comments_controller_test.rb
@@ -41,25 +41,18 @@ class ChangesetCommentsControllerTest < ActionDispatch::IntegrationTest
     get changeset_comments_feed_path(:id => changeset.id, :format => "rss")
     assert_response :success
     assert_equal "application/rss+xml", @response.media_type
-    assert_select "rss", :count => 1 do
-      assert_select "channel", :count => 1 do
-        assert_select "item", :count => 3
-      end
-    end
-    # Rails::Dom::Testing.html_document_fragment.parse(icons)
-    # Gets comment Ids from HTML and checks that they are in descending order
-
     last_comment_id = -1
     assert_select "rss", :count => 1 do
-      assert_select "description", :count => 3 do |descriptions|
-        descriptions.children.each do |description|
-          changeset_dom = Rails::Dom::Testing.html_document_fragment.parse(description.content)
-          comment = changeset_dom.at_css(".changeset-comment-text")
-          next unless comment
-
-          id = comment.content.split[-1].to_i
-          assert_operator id, "<", last_comment_id if last_comment_id != -1
-          last_comment_id = id
+      assert_select "channel", :count => 1 do
+        assert_select "item", :count => 3 do |items|
+          items.each do |item|
+            assert_select item, "link", :count => 1 do |link|
+              match = assert_match(/^#{changeset_url changeset}#c(\d+)$/, link.text)
+              comment_id = match[1].to_i
+              assert_operator comment_id, "<", last_comment_id if last_comment_id != -1
+              last_comment_id = comment_id
+            end
+          end
         end
       end
     end