Merge branch 'pull/4985'

[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 ef8f0e371feb924e35651e227fe47dbaf279f572..d2c3d5196ab9b5ccbcae32aaaed086e03650d7f5 100644 (file)
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -29,7 +29,7 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
     within "form", :text => "Email Address or Username" do
       fill_in "username", :with => user.email
       fill_in "password", :with => "test"
     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
 
     end
   end
 


@@ -38,7 +38,7 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
     click_on "Logout", :match => :first
   end
 
     click_on "Logout", :match => :first
   end
 

-  def within_sidebar(&block)
-    within "#sidebar_content", &block
+  def within_sidebar(&)
+    within("#sidebar_content", &)

   end
 end
   end
 end