diff --git a/test/controllers/api/changeset_comments_controller_test.rb b/test/controllers/api/changeset_comments_controller_test.rb index 21f30714c2..f891e6634b 100644 --- a/test/controllers/api/changeset_comments_controller_test.rb +++ b/test/controllers/api/changeset_comments_controller_test.rb @@ -69,7 +69,7 @@ def test_create_comment_success email = ActionMailer::Base.deliveries.first assert_equal 1, email.to.length - assert_equal "[OpenStreetMap] #{user.display_name} has commented on one of your changesets", email.subject + assert_equal "[OpenHistoricalMap] #{user.display_name} has commented on one of your changesets", email.subject assert_equal private_user.email, email.to.first ActionMailer::Base.deliveries.clear @@ -88,12 +88,12 @@ def test_create_comment_success email = ActionMailer::Base.deliveries.find { |e| e.to.first == private_user.email } assert_not_nil email assert_equal 1, email.to.length - assert_equal "[OpenStreetMap] #{user2.display_name} has commented on one of your changesets", email.subject + assert_equal "[OpenHistoricalMap] #{user2.display_name} has commented on one of your changesets", email.subject email = ActionMailer::Base.deliveries.find { |e| e.to.first == user.email } assert_not_nil email assert_equal 1, email.to.length - assert_equal "[OpenStreetMap] #{user2.display_name} has commented on a changeset you are interested in", email.subject + assert_equal "[OpenHistoricalMap] #{user2.display_name} has commented on a changeset you are interested in", email.subject ActionMailer::Base.deliveries.clear end diff --git a/test/controllers/changeset_comments/feeds_controller_test.rb b/test/controllers/changeset_comments/feeds_controller_test.rb index 4858eb085c..e94a91b7f2 100644 --- a/test/controllers/changeset_comments/feeds_controller_test.rb +++ b/test/controllers/changeset_comments/feeds_controller_test.rb @@ -75,7 +75,7 @@ def test_feed_timeout end assert_response :error assert_equal "application/rss+xml; charset=utf-8", @response.header["Content-Type"] - assert_dom "rss>channel>title", :text => "OpenStreetMap changeset discussion" + assert_dom "rss>channel>title", :text => "OpenHistoricalMap changeset discussion" assert_dom "rss>channel>description", :text => /the list of changeset comments you requested took too long to retrieve/ end @@ -85,7 +85,7 @@ def test_feed_changeset_timeout end assert_response :error assert_equal "application/rss+xml; charset=utf-8", @response.header["Content-Type"] - assert_dom "rss>channel>title", :text => "OpenStreetMap changeset #123 discussion" + assert_dom "rss>channel>title", :text => "OpenHistoricalMap changeset #123 discussion" assert_dom "rss>channel>description", :text => /the list of changeset comments you requested took too long to retrieve/ end end diff --git a/test/controllers/diary_entries_controller_test.rb b/test/controllers/diary_entries_controller_test.rb index 7d543250bc..0c6fdc7270 100644 --- a/test/controllers/diary_entries_controller_test.rb +++ b/test/controllers/diary_entries_controller_test.rb @@ -8,7 +8,7 @@ def setup # Create the default language for diary entries create(:language, :code => "en") # Stub nominatim response for diary entry locations - stub_request(:get, %r{^https://nominatim\.openstreetmap\.org/reverse\?}) + stub_request(:get, %r{^https://nominatim\.openhistoricalmap\.org/reverse\?}) .to_return(:status => 404) end @@ -669,7 +669,7 @@ def test_show_og_image_with_no_image assert_dom "> @content", ActionController::Base.helpers.image_url("osm_logo_256.png", :host => root_url) end assert_dom "head meta[property='og:image:alt']" do - assert_dom "> @content", "OpenStreetMap logo" + assert_dom "> @content", "OpenHistoricalMap logo" end end @@ -739,7 +739,7 @@ def test_show_og_image_with_invalid_uri assert_dom "> @content", ActionController::Base.helpers.image_url("osm_logo_256.png", :host => root_url) end assert_dom "head meta[property='og:image:alt']" do - assert_dom "> @content", "OpenStreetMap logo" + assert_dom "> @content", "OpenHistoricalMap logo" end end diff --git a/test/controllers/messages_controller_test.rb b/test/controllers/messages_controller_test.rb index 70d1beb183..3340d78c10 100644 --- a/test/controllers/messages_controller_test.rb +++ b/test/controllers/messages_controller_test.rb @@ -63,7 +63,7 @@ def test_new_form get new_message_path(recipient_user) assert_response :success assert_template "new" - assert_select "title", "Send message | OpenStreetMap" + assert_select "title", "Send message | OpenHistoricalMap" assert_select "a[href='#{user_path recipient_user}']", :text => recipient_user.display_name assert_select "form[action='/messages']", :count => 1 do assert_select "input[type='hidden'][name='display_name'][value='#{recipient_user.display_name}']" @@ -91,7 +91,7 @@ def test_new_get_with_params end assert_response :success assert_template "new" - assert_select "title", "Send message | OpenStreetMap" + assert_select "title", "Send message | OpenHistoricalMap" assert_select "form[action='/messages']", :count => 1 do assert_select "input[type='hidden'][name='display_name'][value='#{recipient_user.display_name}']" assert_select "input#message_title", :count => 1 do @@ -121,7 +121,7 @@ def test_new_post_no_body end assert_response :success assert_template "new" - assert_select "title", "Send message | OpenStreetMap" + assert_select "title", "Send message | OpenHistoricalMap" assert_select "form[action='/messages']", :count => 1 do assert_select "input[type='hidden'][name='display_name'][value='#{recipient_user.display_name}']" assert_select "input#message_title", :count => 1 do @@ -151,7 +151,7 @@ def test_new_post_no_title end assert_response :success assert_template "new" - assert_select "title", "Send message | OpenStreetMap" + assert_select "title", "Send message | OpenHistoricalMap" assert_select "form[action='/messages']", :count => 1 do assert_select "input[type='hidden'][name='display_name'][value='#{recipient_user.display_name}']" assert_select "input#message_title", :count => 1 do @@ -183,7 +183,7 @@ def test_new_post_send assert_equal "Message sent", flash[:notice] e = ActionMailer::Base.deliveries.first assert_equal [recipient_user.email], e.to - assert_equal "[OpenStreetMap] Test Message", e.subject + assert_equal "[OpenHistoricalMap] Test Message", e.subject assert_match(/Test message body/, e.text_part.decoded) assert_match(/Test message body/, e.html_part.decoded) assert_match %r{#{Settings.server_url}/messages/[0-9]+}, e.text_part.decoded @@ -254,7 +254,7 @@ def test_reply get message_reply_path(message) assert_response :success assert_template "new" - assert_select "title", "Re: #{message.title} | OpenStreetMap" + assert_select "title", "Re: #{message.title} | OpenHistoricalMap" assert_select "form[action='/messages']", :count => 1 do assert_select "input[type='hidden'][name='display_name'][value='#{user.display_name}']" assert_select "input#message_title[value='Re: #{message.title}']", :count => 1 @@ -270,7 +270,7 @@ def test_reply get message_reply_path(message) assert_response :success assert_template "new" - assert_select "title", "Re: #{message.title} | OpenStreetMap" + assert_select "title", "Re: #{message.title} | OpenHistoricalMap" assert_select "form[action='/messages']", :count => 1 do assert_select "input[type='hidden'][name='display_name'][value='#{recipient_user.display_name}']" assert_select "input#message_title[value='Re: #{message.title}']", :count => 1 diff --git a/test/helpers/title_helper_test.rb b/test/helpers/title_helper_test.rb index 1c26a7220d..ed0c05fae6 100644 --- a/test/helpers/title_helper_test.rb +++ b/test/helpers/title_helper_test.rb @@ -3,23 +3,23 @@ class TitleHelperTest < ActionView::TestCase def test_set_title set_title - assert_equal "OpenStreetMap", response.header["X-Page-Title"] + assert_equal "OpenHistoricalMap", response.header["X-Page-Title"] assert_nil @title set_title(nil) - assert_equal "OpenStreetMap", response.header["X-Page-Title"] + assert_equal "OpenHistoricalMap", response.header["X-Page-Title"] assert_nil @title set_title("Test Title") - assert_equal "Test%20Title%20%7C%20OpenStreetMap", response.header["X-Page-Title"] + assert_equal "Test%20Title%20%7C%20OpenHistoricalMap", response.header["X-Page-Title"] assert_equal "Test Title", @title set_title("Test & Title") - assert_equal "Test%20%26%20Title%20%7C%20OpenStreetMap", response.header["X-Page-Title"] + assert_equal "Test%20%26%20Title%20%7C%20OpenHistoricalMap", response.header["X-Page-Title"] assert_equal "Test & Title", @title set_title("Tést & Tïtlè") - assert_equal "T%C3%A9st%20%26%20T%C3%AFtl%C3%A8%20%7C%20OpenStreetMap", response.header["X-Page-Title"] + assert_equal "T%C3%A9st%20%26%20T%C3%AFtl%C3%A8%20%7C%20OpenHistoricalMap", response.header["X-Page-Title"] assert_equal "Tést & Tïtlè", @title end end diff --git a/test/system/site_test.rb b/test/system/site_test.rb index d7b9f279e9..4449a09af2 100644 --- a/test/system/site_test.rb +++ b/test/system/site_test.rb @@ -4,7 +4,7 @@ class SiteTest < ApplicationSystemTestCase test "visiting the index" do visit "/" - assert_selector "h1", :text => "OpenStreetMap" + assert_selector "h1", :text => "OpenHistoricalMap" end test "tooltip shows for Layers button" do diff --git a/test/system/user_logout_test.rb b/test/system/user_logout_test.rb index 2f5331711e..0c58b643a8 100644 --- a/test/system/user_logout_test.rb +++ b/test/system/user_logout_test.rb @@ -28,7 +28,7 @@ class UserLogoutTest < ApplicationSystemTestCase assert_no_content "Log In" visit logout_path - assert_content "Logout from OpenStreetMap" + assert_content "Logout from OpenHistoricalMap" click_on "Logout" assert_content "Log In" @@ -39,7 +39,7 @@ class UserLogoutTest < ApplicationSystemTestCase assert_no_content "Log In" visit logout_path(:referer => "/traces") - assert_content "Logout from OpenStreetMap" + assert_content "Logout from OpenHistoricalMap" click_on "Logout" assert_content "Log In"