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

[rails.git] / test / system / user_logout_test.rb

diff --git a/test/system/user_logout_test.rb b/test/system/user_logout_test.rb
index bf43e97b6cbf9ff1c68138879f1542b41008a405..2f5331711eaa40daa8a331aac883eeed7572af87 100644 (file)
--- a/test/system/user_logout_test.rb
+++ b/test/system/user_logout_test.rb
@@ -4,45 +4,45 @@ class UserLogoutTest < ApplicationSystemTestCase
   test "Sign out via link" do
     user = create(:user)
     sign_in_as(user)
-    assert_not page.has_content? "Log In"
+    assert_no_content "Log In"
 
     click_on user.display_name
     click_on "Log Out"
-    assert page.has_content? "Log In"
+    assert_content "Log In"
   end
 
   test "Sign out via link with referer" do
     user = create(:user)
     sign_in_as(user)
     visit traces_path
-    assert_not page.has_content? "Log In"
+    assert_no_content "Log In"
 
     click_on user.display_name
     click_on "Log Out"
-    assert page.has_content? "Log In"
-    assert page.has_content? "Public GPS Traces"
+    assert_content "Log In"
+    assert_content "Public GPS Traces"
   end
 
   test "Sign out via fallback page" do
     sign_in_as(create(:user))
-    assert_not page.has_content? "Log In"
+    assert_no_content "Log In"
 
     visit logout_path
-    assert page.has_content? "Logout from OpenStreetMap"
+    assert_content "Logout from OpenStreetMap"
 
-    click_button "Logout"
-    assert page.has_content? "Log In"
+    click_on "Logout"
+    assert_content "Log In"
   end
 
   test "Sign out via fallback page with referer" do
     sign_in_as(create(:user))
-    assert_not page.has_content? "Log In"
+    assert_no_content "Log In"
 
     visit logout_path(:referer => "/traces")
-    assert page.has_content? "Logout from OpenStreetMap"
+    assert_content "Logout from OpenStreetMap"
 
-    click_button "Logout"
-    assert page.has_content? "Log In"
-    assert page.has_content? "Public GPS Traces"
+    click_on "Logout"
+    assert_content "Log In"
+    assert_content "Public GPS Traces"
   end
 end