Merge pull request #444 from seleniumbase/settings-refactoring

Settings refactoring

Author: mdmintz

examples/custom_settings.py

@@ -30,6 +30,14 @@
 # If True and --proxy=IP_ADDRESS:PORT is invalid, then error immediately.
 RAISE_INVALID_PROXY_STRING_EXCEPTION = True
 
+# Default browser resolutions when opening new windows for tests.
+# (Headless resolutions take priority, and include all browsers.)
+# (Firefox starts maximized by default when running in GUI Mode.)
+CHROME_START_WIDTH = 1250
+CHROME_START_HEIGHT = 840
+HEADLESS_START_WIDTH = 1440
+HEADLESS_START_HEIGHT = 1880
+
 # Changing the default behavior of MasterQA Mode.
 MASTERQA_DEFAULT_VALIDATION_MESSAGE = "Does the page look good?"
 MASTERQA_WAIT_TIME_BEFORE_VERIFY = 0.5

requirements.txt

@@ -37,7 +37,7 @@ pymysql==0.9.3
 pyotp==2.3.0
 boto==2.49.0
 cffi>=1.13.2
-tqdm>=4.40.1
+tqdm>=4.40.2
 flake8==3.7.9
 certifi>=2019.11.28
 pdfminer.six==20191110

seleniumbase/config/proxy_list.py

@@ -19,8 +19,9 @@
 """
 
 PROXY_LIST = {
-    "example1": "66.7.113.39:3128",  # (Example) - set your own proxy here
-    "example2": "104.236.248.219:3128",  # (Example) - set your own proxy here
+    "example1": "104.236.248.219:3128",  # (Example) - set your own proxy here
+    "example2": "165.227.102.37:3128",  # (Example) - set your own proxy here
+    "example3": "23.244.28.27:3128",  # (Example) - set your own proxy here
     "proxy1": None,
     "proxy2": None,
     "proxy3": None,

seleniumbase/config/settings.py

@@ -77,8 +77,6 @@
 # If True, the Content Security Policy will be disabled on Chrome.
 # If False, each website's default Content Security Policy will be used.
 # (A website's CSP may prevent SeleniumBase from loading custom JavaScript.)
-# If using demo_mode or MasterQA, this value will become True regardless,
-# with the exception of running in headless mode, in which case it'll be False.
 # You can also disable the CSP on the command line by using "--disable_csp".
 DISABLE_CSP_ON_CHROME = False
 
@@ -87,6 +85,14 @@
 # (This applies when using --proxy=[PROXY_STRING] for using a proxy server.)
 RAISE_INVALID_PROXY_STRING_EXCEPTION = True
 
+# Default browser resolutions when opening new windows for tests.
+# (Headless resolutions take priority, and include all browsers.)
+# (Firefox starts maximized by default when running in GUI Mode.)
+CHROME_START_WIDTH = 1250
+CHROME_START_HEIGHT = 840
+HEADLESS_START_WIDTH = 1440
+HEADLESS_START_HEIGHT = 1880
+
 # #####>>>>>----- MasterQA SETTINGS -----<<<<<#####
 # ##### (Used when importing MasterQA as the parent class)
 

seleniumbase/fixtures/base_case.py

@@ -1457,8 +1457,10 @@ def get_new_driver(self, browser=None, headless=None,
             self.driver = new_driver
             if self.headless:
                 # Make sure the invisible browser window is big enough
+                width = settings.HEADLESS_START_WIDTH
+                height = settings.HEADLESS_START_HEIGHT
                 try:
-                    self.set_window_size(1440, 1880)
+                    self.set_window_size(width, height)
                     self.wait_for_ready_state_complete()
                 except Exception:
                     # This shouldn't fail, but in case it does,
@@ -1467,8 +1469,8 @@ def get_new_driver(self, browser=None, headless=None,
                     pass
             else:
                 if self.browser == 'chrome':
-                    width = 1250
-                    height = 840
+                    width = settings.CHROME_START_WIDTH
+                    height = settings.CHROME_START_HEIGHT
                     try:
                         if self.maximize_option:
                             self.driver.maximize_window()
@@ -4198,10 +4200,12 @@ def setUp(self, masterqa_mode=False):
                 self.testcase_manager.insert_testcase_data(data_payload)
                 self.case_start_time = int(time.time() * 1000)
             if self.headless:
+                width = settings.HEADLESS_START_WIDTH
+                height = settings.HEADLESS_START_HEIGHT
                 try:
                     # from pyvirtualdisplay import Display  # Skip for own lib
                     from seleniumbase.virtual_display.display import Display
-                    self.display = Display(visible=0, size=(1440, 1880))
+                    self.display = Display(visible=0, size=(width, height))
                     self.display.start()
                     self.headless_active = True
                 except Exception:

setup.py

@@ -45,7 +45,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.34.0',
+    version='1.34.1',
     description='Fast, Easy, and Reliable Browser Automation & Testing.',
     long_description=long_description,
     long_description_content_type='text/markdown',
@@ -120,7 +120,7 @@
         'pyotp==2.3.0',
         'boto==2.49.0',
         'cffi>=1.13.2',
-        'tqdm>=4.40.1',
+        'tqdm>=4.40.2',
         'flake8==3.7.9',
         'certifi>=2019.11.28',
         'pdfminer.six==20191110',