lib/howitzer/capybara_helpers.rb in howitzer-2.1.1 vs lib/howitzer/capybara_helpers.rb in howitzer-2.2.0

@@ -12,11 +12,11 @@
         BROWSERSTACK = :browserstack,
         CROSSBROWSERTESTING = :crossbrowsertesting
       ].freeze,
       LOCAL_BROWSERS = [
         HEADLESS_CHROME = :headless_chrome,
-        PHANTOMJS = :phantomjs,
+        HEADLESS_FIREFOX = :headless_firefox,
         POLTERGEIST = :poltergeist,
         SELENIUM = :selenium,
         SELENIUM_GRID = :selenium_grid,
         WEBKIT = :webkit
       ].freeze
@@ -49,11 +49,11 @@
     # @return [Boolean] whether or not current browser is Google Chrome.
     # @raise [CloudBrowserNotSpecifiedError] if cloud driver and missing browser name
     # @raise [SelBrowserNotSpecifiedError] if selenium driver and missing browser name
 
     def chrome_browser?
-      browser?(:chrome) || Howitzer.driver == HEADLESS_CHROME.to_s
+      browser? :chrome
     end
 
     # @return [Boolean] whether or not current browser is Safari.
     # @raise [CloudBrowserNotSpecifiedError] if cloud driver and missing browser name
     # @raise [SelBrowserNotSpecifiedError] if selenium driver and missing browser name
@@ -153,21 +153,29 @@
 
     def cloud_browser?(*browser_aliases)
       unless Howitzer.cloud_browser_name.nil?
         return browser_aliases.include?(Howitzer.cloud_browser_name.to_s.downcase.to_sym)
       end
+
       raise Howitzer::CloudBrowserNotSpecifiedError, CHECK_YOUR_SETTINGS_MSG
     end
 
     def selenium_browser?(*browser_aliases)
-      unless Howitzer.selenium_browser.nil?
-        return browser_aliases.include?(Howitzer.selenium_browser.to_s.to_sym)
-      end
+      return browser_aliases.include?(Howitzer.selenium_browser.to_s.to_sym) unless Howitzer.selenium_browser.nil?
+
       raise Howitzer::SelBrowserNotSpecifiedError, CHECK_YOUR_SETTINGS_MSG
     end
 
     def selenium_driver?
       Howitzer.driver.to_sym == SELENIUM
+    end
+
+    def headless_chrome_driver?
+      Howitzer.driver.to_sym == HEADLESS_CHROME
+    end
+
+    def headless_firefox_driver?
+      Howitzer.driver.to_sym == HEADLESS_FIREFOX
     end
 
     def selenium_grid_driver?
       Howitzer.driver.to_sym == SELENIUM_GRID
     end