Skip to content

Fix dev container CI by returning server_protocol to upstream value #443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rub21 wants to merge 3 commits into
base: staging
Choose a base branch
from
Open

Fix dev container CI by returning server_protocol to upstream value #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b549c25
Return server_protocol and server_url to upstream values
Rub21 Jul 20, 2026
0804474
Return URL scheme expectations in tests to upstream values
Rub21 Jul 20, 2026
e677f23
Force Mapnik layer in locationCookie teaspoon tests
Rub21 Jul 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config/settings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Comment on lines +2 to +3

@1ec5 1ec5 Jul 21, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make sure that OpenHistoricalMap/issues#1091 hasn’t regressed per #301 (comment).

embed_server_url: "https://embed.openhistoricalmap.org/"

# Publisher
Expand Down
2 changes: 1 addition & 1 deletion test/integration/user_creation_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions test/javascripts/osm_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,15 +339,15 @@ describe("OSM", function () {
it("creates a location cookie value", function () {
$("body").append("<div id='map'>");
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();
});

it("respects zoomPrecision", function () {
$("body").append("<div id='map'>");
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
Expand Down
8 changes: 4 additions & 4 deletions test/lib/rich_text_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ def test_text_to_html_linkify_recognize
r = RichText.new("text", "foo repl.example.com/some/path?query=te<st&limit=20>10#result12 bar")
assert_html r do
assert_dom "a", :count => 1, :text => "repl.example.com/some/path?query=te<st&limit=20>10#result12" do
assert_dom "> @href", "https://replace-me.example.com/some/path?query=te<st&limit=20>10#result12"
assert_dom "> @href", "http://replace-me.example.com/some/path?query=te<st&limit=20>10#result12"
assert_dom "> @rel", "nofollow noopener noreferrer"
end
end
Expand Down Expand Up @@ -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
Expand All @@ -351,8 +351,8 @@ def test_text_to_html_linkify_recognize_path
with_settings(:linkify => { :detection_rules => [{ :patterns => ["@(?<username>\\w+)"], :path_template => "user/\\k<username>" }] }) 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
Expand Down
Loading