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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1f9792d39608c15770e62285b2d5185de26b4eaf..6c0a780384a59549c043c78b90fb7079c0940d62 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1922,7 +1922,7 @@ en:
       failure: Couldn't update profile.
   sessions:
     new:
-      tab_title: "Log in"
+      tab_title: "Log In"
       login_to_authorize_html: "Log in to OpenStreetMap to access %{client_app_name}."
       email or username: "Email Address or Username"
       password: "Password"
@@ -2653,8 +2653,8 @@ en:
       need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
     settings_menu:
       account_settings: Account Settings
-      oauth2_applications: OAuth 2 applications
-      oauth2_authorizations: OAuth 2 authorizations
+      oauth2_applications: OAuth 2 Applications
+      oauth2_authorizations: OAuth 2 Authorizations
       muted_users: Muted Users
     auth_providers:
       openid_url: "OpenID URL"
@@ -2771,7 +2771,7 @@ en:
   users:
     new:
       title: "Sign Up"
-      tab_title: "Sign up"
+      tab_title: "Sign Up"
       signup_to_authorize_html: "Sign up with OpenStreetMap to access %{client_app_name}."
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
       please_contact_support_html: 'Please contact %{support_link} to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
@@ -2904,7 +2904,7 @@ en:
       index:
         heading_html: "%{user}'s Comments"
         changesets: "Changesets"
-        diary_entries: "Diary entries"
+        diary_entries: "Diary Entries"
         no_comments: "No comments"
     changeset_comments:
       index:

diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
index 496f37c16be4be820d16dfb753ab1bed77c8cd2a..852f270b6ef713571339a1ada651a4c3ed219826 100644 (file)
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -46,4 +46,8 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
   def within_content_body(&)
     within("#content > .content-body", &)
   end
+
+  def within_content_heading(&)
+    within("#content > .content-heading", &)
+  end
 end

diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb
index e26ae89ac6556cbec289f25e52ed445ac98e33b6..ae5e114c3d19d4a415633717fa606921a797cfa1 100644 (file)
--- a/test/system/issues_test.rb
+++ b/test/system/issues_test.rb
@@ -5,7 +5,10 @@ class IssuesTest < ApplicationSystemTestCase
 
   def test_view_issues_not_logged_in
     visit issues_path
-    assert_content "Log in"
+
+    within_content_heading do
+      assert_content "Log In"
+    end
   end
 
   def test_view_issues_normal_user

diff --git a/test/system/user_signup_test.rb b/test/system/user_signup_test.rb
index 2fb90fc3a41acf81873d53ab3d640bc9b34e1771..2d05447a6a280980128e605e4d4b16aee4b4eb59 100644 (file)
--- a/test/system/user_signup_test.rb
+++ b/test/system/user_signup_test.rb
@@ -79,7 +79,9 @@ class UserSignupTest < ApplicationSystemTestCase
   test "Sign up from login page" do
     visit login_path
 
-    click_on "Sign up"
+    within_content_heading do
+      click_on "Sign Up"
+    end
 
     within_content_body do
       assert_content "Confirm Password"