Merge pull request #5677 from tomhughes/user-list-enhancements

[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 63c8090a83d735929ab1421fcafb0d935dc813aa..852f270b6ef713571339a1ada651a4c3ed219826 100644 (file)
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -9,6 +9,7 @@ end
 class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
   driven_by :selenium, :using => :headless_firefox do |options|
     options.add_preference("intl.accept_languages", "en")
+    options.binary = Settings.system_test_firefox_binary if Settings.system_test_firefox_binary
   end
 
   def before_setup
@@ -38,7 +39,15 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
     click_on "Logout", :match => :first
   end
 
-  def within_sidebar(&block)
-    within "#sidebar_content", &block
+  def within_sidebar(&)
+    within("#sidebar_content", &)
+  end
+
+  def within_content_body(&)
+    within("#content > .content-body", &)
+  end
+
+  def within_content_heading(&)
+    within("#content > .content-heading", &)
   end
 end