Merge pull request #135 from seleniumbase/upgrade-headless-mode

Upgrade headless mode

Author: mdmintz

.gitignore

@@ -28,6 +28,7 @@ nosetests.xml
 
 # py.test
 .cache/*
+.pytest_cache/*
 .pytest_config
 
 # Developer

requirements.txt

@@ -3,8 +3,8 @@ setuptools>=38.2.4
 ipython==5.4.1
 selenium==3.8.0
 nose==1.3.7
-pytest==3.2.5
-pytest-html==1.16.0
+pytest==3.4.0
+pytest-html==1.16.1
 six==1.10.0
 flake8==3.4.1
 requests==2.18.4

seleniumbase/core/browser_launcher.py

@@ -29,7 +29,7 @@ def _create_firefox_profile(downloads_path):
     return profile
 
 
-def get_driver(browser_name):
+def get_driver(browser_name, headless=False):
     '''
     Spins up a new web browser and returns the driver.
     Tests that run with pytest spin up the browser from here.
@@ -45,8 +45,12 @@ def get_driver(browser_name):
                 profile = _create_firefox_profile(downloads_path)
                 firefox_capabilities = DesiredCapabilities.FIREFOX.copy()
                 firefox_capabilities['marionette'] = True
+                options = webdriver.FirefoxOptions()
+                if headless:
+                    options.add_argument('-headless')
                 firefox_driver = webdriver.Firefox(
-                    firefox_profile=profile, capabilities=firefox_capabilities)
+                    firefox_profile=profile, capabilities=firefox_capabilities,
+                    firefox_options=options)
             except WebDriverException:
                 # Don't use Geckodriver: Only works for old versions of Firefox
                 profile = _create_firefox_profile(downloads_path)
@@ -79,6 +83,8 @@ def get_driver(browser_name):
             chrome_options.add_argument("--allow-file-access-from-files")
             chrome_options.add_argument("--allow-running-insecure-content")
             chrome_options.add_argument("--disable-infobars")
+            if headless:
+                chrome_options.add_argument("--headless")
             if settings.START_CHROME_IN_FULL_SCREEN_MODE:
                 # Run Chrome in full screen mode on WINDOWS
                 chrome_options.add_argument("--start-maximized")

seleniumbase/fixtures/base_case.py

@@ -1420,7 +1420,8 @@ def setUp(self):
                 self.display.start()
                 self.headless_active = True
             if self.with_selenium:
-                self.driver = browser_launcher.get_driver(self.browser)
+                self.driver = browser_launcher.get_driver(self.browser,
+                                                          self.headless)
 
     def __insert_test_result(self, state, err):
         data_payload = TestcaseDataPayload()

seleniumbase/plugins/selenium_plugin.py

@@ -134,7 +134,7 @@ def beforeTest(self, test):
             from how Selenium is run remotely, such as from Jenkins. """
 
         if self.options.headless:
-            self.display = Display(visible=0, size=(1200, 800))
+            self.display = Display(visible=0, size=(1920, 1200))
             self.display.start()
             self.headless_active = True
         if self.options.servername == "localhost":
@@ -201,4 +201,5 @@ def __select_browser(self, browser_name):
                 self.options.port),
                 self.browser_settings)
         else:
-            return browser_launcher.get_driver(browser_name)
+            return browser_launcher.get_driver(browser_name,
+                                               self.options.headless)

server_requirements.txt

@@ -3,8 +3,8 @@ setuptools>=38.2.4
 ipython==5.4.1
 selenium==2.53.6
 nose==1.3.7
-pytest==3.2.5
-pytest-html==1.16.0
+pytest==3.4.0
+pytest-html==1.16.1
 six==1.10.0
 flake8==3.4.1
 requests==2.18.4

server_setup.py

@@ -8,7 +8,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.4.16',
+    version='1.4.17',
     description='Web Automation & Testing Framework - http://seleniumbase.com',
     long_description='Web Automation and Testing Framework - seleniumbase.com',
     platforms='Mac * Windows * Linux * Docker',
@@ -23,8 +23,8 @@
         'ipython==5.4.1',
         'selenium==2.53.6',
         'nose==1.3.7',
-        'pytest==3.2.5',
-        'pytest-html==1.16.0',
+        'pytest==3.4.0',
+        'pytest-html==1.16.1',
         'six==1.10.0',
         'flake8==3.4.1',
         'requests==2.18.4',

setup.py

@@ -8,7 +8,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.4.16',
+    version='1.4.17',
     description='Web Automation & Testing Framework - http://seleniumbase.com',
     long_description='Web Automation and Testing Framework - seleniumbase.com',
     platforms='Mac * Windows * Linux * Docker',
@@ -23,8 +23,8 @@
         'ipython==5.4.1',
         'selenium==3.8.0',
         'nose==1.3.7',
-        'pytest==3.2.5',
-        'pytest-html==1.16.0',
+        'pytest==3.4.0',
+        'pytest-html==1.16.1',
         'six==1.10.0',
         'flake8==3.4.1',
         'requests==2.18.4',