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

[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 a2e145fcc6aae2b6380acc3825e44021c445081f..099d2c0c02775ba95f2b616090aa98196e16452a 100644 (file)
--- a/test/system/user_logout_test.rb
+++ b/test/system/user_logout_test.rb
@@ -4,14 +4,28 @@ class UserLogoutTest < ApplicationSystemTestCase
   test "Sign out via link" do
     user = create(:user)
     sign_in_as(user)
   test "Sign out via link" do
     user = create(:user)
     sign_in_as(user)

+    assert_not page.has_content? "Log In"

 
     click_on user.display_name
     click_on "Log Out"
     assert page.has_content? "Log In"
   end
 
 
     click_on user.display_name
     click_on "Log Out"
     assert page.has_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"
+
+    click_on user.display_name
+    click_on "Log Out"
+    assert page.has_content? "Log In"
+    assert page.has_content? "Public GPS traces"
+  end
+

   test "Sign out via fallback page" do
     sign_in_as(create(:user))
   test "Sign out via fallback page" do
     sign_in_as(create(:user))

+    assert_not page.has_content? "Log In"

 
     visit logout_path
     assert page.has_content? "Logout from OpenStreetMap"
 
     visit logout_path
     assert page.has_content? "Logout from OpenStreetMap"


@@ -19,4 +33,16 @@ class UserLogoutTest < ApplicationSystemTestCase
     click_button "Logout"
     assert page.has_content? "Log In"
   end
     click_button "Logout"
     assert page.has_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"
+
+    visit logout_path(:referer => "/traces")
+    assert page.has_content? "Logout from OpenStreetMap"
+
+    click_button "Logout"
+    assert page.has_content? "Log In"
+    assert page.has_content? "Public GPS traces"
+  end

 end
 end