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

[rails.git] / test / application_system_test_case.rb

diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
index 7931546d403028e755d1aaa6af6abb89a0e76f77..d2c3d5196ab9b5ccbcae32aaaed086e03650d7f5 100644 (file)
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -29,11 +29,16 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
     within "form", :text => "Email Address or Username" do
       fill_in "username", :with => user.email
       fill_in "password", :with => "test"
-      click_on "Login"
+      click_on "Log in"
     end
   end
 
-  def within_sidebar(&block)
-    within "#sidebar_content", &block
+  def sign_out
+    visit logout_path
+    click_on "Logout", :match => :first
+  end
+
+  def within_sidebar(&)
+    within("#sidebar_content", &)
   end
 end