X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/90fd22e2a35cea1e4bc55185f93267c49fb37b6e..881d0b11b519524873ec28ea9ca8010b5710c83b:/test/application_system_test_case.rb

diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
index 7931546d4..f7769426c 100644
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -7,8 +7,11 @@ ActiveSupport.on_load(:action_dispatch_system_test_case) do
 end
 
 class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
-  driven_by :selenium, :using => :headless_firefox do |options|
+  include ActionMailer::TestCase::ClearTestDeliveries
+
+  driven_by :selenium, :using => Settings.system_test_headless ? :headless_firefox : :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
@@ -29,11 +32,24 @@ 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
+
+  def within_content_body(&)
+    within("#content > .content-body", &)
+  end
+
+  def within_content_heading(&)
+    within("#content > .content-heading", &)
   end
 end