From b549c25989da08485b804d4e3b8c733a2191d27e Mon Sep 17 00:00:00 2001 From: Rub21 Date: Mon, 20 Jul 2026 10:56:07 -0500 Subject: [PATCH 1/3] Return server_protocol and server_url to upstream values --- config/settings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/settings.yml b/config/settings.yml index 887de1fcd2..b09e1ced5d 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -1,6 +1,6 @@ # The server protocol and host -server_protocol: "https" -server_url: "www.openhistoricalmap.org" +server_protocol: "http" +server_url: "openstreetmap.example.com" embed_server_url: "https://embed.openhistoricalmap.org/" # Publisher From 0804474030c18958159a63d41c5c8f6703548e62 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Mon, 20 Jul 2026 11:50:36 -0500 Subject: [PATCH 2/3] Return URL scheme expectations in tests to upstream values --- test/integration/user_creation_test.rb | 2 +- test/lib/rich_text_test.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb index ee71c0d16c..c3d60ed8cf 100644 --- a/test/integration/user_creation_test.rb +++ b/test/integration/user_creation_test.rb @@ -152,7 +152,7 @@ def test_user_create_success register_email = ActionMailer::Base.deliveries.first assert_equal register_email.to.first, new_email - found_confirmation_url = register_email.parts.first.parts.first.to_s =~ %r{\shttps://test.host(/\S+)\s} + found_confirmation_url = register_email.parts.first.parts.first.to_s =~ %r{\shttp://test.host(/\S+)\s} assert found_confirmation_url confirmation_url = Regexp.last_match(1) diff --git a/test/lib/rich_text_test.rb b/test/lib/rich_text_test.rb index e0b3aeddc0..270e28a6ad 100644 --- a/test/lib/rich_text_test.rb +++ b/test/lib/rich_text_test.rb @@ -242,7 +242,7 @@ def test_text_to_html_linkify_recognize r = RichText.new("text", "foo repl.example.com/some/path?query=te10#result12 bar") assert_html r do assert_dom "a", :count => 1, :text => "repl.example.com/some/path?query=te10#result12" do - assert_dom "> @href", "https://replace-me.example.com/some/path?query=te10#result12" + assert_dom "> @href", "http://replace-me.example.com/some/path?query=te10#result12" assert_dom "> @rel", "nofollow noopener noreferrer" end end @@ -326,7 +326,7 @@ def test_text_to_html_linkify_recognize_wiki r = RichText.new("text", "foo wiki.example.com/Tag:surface%3Dmetal bar") assert_html r do assert_dom "a", :count => 1, :text => "wiki.example.com/Tag:surface%3Dmetal" do - assert_dom "> @href", "https://replace-me-wiki.example.com/Tag:surface%3Dmetal" + assert_dom "> @href", "http://replace-me-wiki.example.com/Tag:surface%3Dmetal" assert_dom "> @rel", "nofollow noopener noreferrer" end end @@ -351,8 +351,8 @@ def test_text_to_html_linkify_recognize_path with_settings(:linkify => { :detection_rules => [{ :patterns => ["@(?\\w+)"], :path_template => "user/\\k" }] }) do r = RichText.new("text", "foo @example bar") assert_html r do - assert_dom "a", :count => 1, :text => "https://test.host/user/example" do - assert_dom "> @href", "https://test.host/user/example" + assert_dom "a", :count => 1, :text => "http://test.host/user/example" do + assert_dom "> @href", "http://test.host/user/example" assert_dom "> @rel", "nofollow noopener noreferrer" end end From e677f239f84159a335e61083e7a968d1d91c4584 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Mon, 20 Jul 2026 14:12:20 -0500 Subject: [PATCH 3/3] Force Mapnik layer in locationCookie teaspoon tests --- test/javascripts/osm_test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/javascripts/osm_test.js b/test/javascripts/osm_test.js index c5be6b5f6a..b6f1adedc0 100644 --- a/test/javascripts/osm_test.js +++ b/test/javascripts/osm_test.js @@ -339,7 +339,7 @@ describe("OSM", function () { it("creates a location cookie value", function () { $("body").append("
"); const map = new L.OSM.Map("map", { center: [57.6247, -3.6845], zoom: 9 }); - map.updateLayers(""); + map.updateLayers("M"); expect(OSM.locationCookie(map)).to.eq("-3.685|57.625|9|M"); $("#map").remove(); }); @@ -347,7 +347,7 @@ describe("OSM", function () { it("respects zoomPrecision", function () { $("body").append("
"); const map = new L.OSM.Map("map", { center: [57.6247, -3.6845], zoom: 9 }); - map.updateLayers(""); + map.updateLayers("M"); expect(OSM.locationCookie(map)).to.eq("-3.685|57.625|9|M"); // map.setZoom() doesn't update the zoom level for some reason // using map._zoom here to update the zoom level manually