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

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

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

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"