Fix output folder names when driver type is empty

CHANGELOG.rst

@@ -10,6 +10,7 @@ v1.4.0
 - New config property 'reuse_driver_session' in [Driver] section to use the same driver in all tests
 - Rename config property 'restart_driver_fail' in [Driver] section to 'restart_driver_after_failure'
 - Add @no_browser feature or scenario tag to do not start the driver in these tests
+- Fix output folder names when driver type is empty
 
 v1.3.0
 ------

toolium/driver_wrapper.py

@@ -232,7 +232,7 @@ def connect(self, maximize=True):
         :param maximize: True if the driver should be maximized
         :returns: selenium driver
         """
-        if not self.config.get('Driver', 'type'):
+        if not self.config.get('Driver', 'type') or self.config.get('Driver', 'type') in ['api', 'no_browser']:
             return None
 
         self.driver = ConfigDriver(self.config).create_driver()

toolium/driver_wrappers_pool.py

@@ -274,18 +274,19 @@ def _find_parent_directory(directory, filename):
     def configure_visual_directories(cls, driver_info):
         """Configure screenshots, videos and visual directories
 
-        :param driver_info: driver property value to rename folders
+        :param driver_info: driver property value to name folders
         """
         if cls.screenshots_directory is None:
             # Unique screenshots and videos directories
             date = datetime.datetime.now().strftime('%Y-%m-%d_%H%M%S')
-            cls.screenshots_directory = os.path.join(cls.output_directory, 'screenshots', date + '_' + driver_info)
+            folder_name = '%s_%s' % (date, driver_info) if driver_info else date
+            cls.screenshots_directory = os.path.join(cls.output_directory, 'screenshots', folder_name)
             cls.screenshots_number = 1
-            cls.videos_directory = os.path.join(cls.output_directory, 'videos', date + '_' + driver_info)
+            cls.videos_directory = os.path.join(cls.output_directory, 'videos', folder_name)
             cls.videos_number = 1
 
             # Unique visualtests directories
-            cls.visual_output_directory = os.path.join(cls.output_directory, 'visualtests', date + '_' + driver_info)
+            cls.visual_output_directory = os.path.join(cls.output_directory, 'visualtests', folder_name)
             cls.visual_number = 1
 
     @classmethod

toolium/test/test_driver_wrapper.py

@@ -218,7 +218,28 @@ def test_connect(create_driver, driver_wrapper):
     assert logging.getLevelName(logger.level) == 'DEBUG'
 
 
-def test_connect_api(driver_wrapper):
+api_tests = (
+    '',
+    'api',
+    'no_browser',
+)
+
+
+@pytest.mark.parametrize("driver_type", api_tests)
+def test_connect_api(driver_type, driver_wrapper):
+    # Mock data
+    expected_driver = None
+    driver_wrapper.config.set('Driver', 'type', driver_type)
+
+    # Connect and check that the returned driver is None
+    assert driver_wrapper.connect(maximize=False) == expected_driver  # Check that the wrapper has been configured
+    assert driver_wrapper.config.get('Driver', 'type') == driver_type
+    assert driver_wrapper.config.get('Jira', 'enabled') == 'false'
+    logger = logging.getLogger('selenium.webdriver.remote.remote_connection')
+    assert logging.getLevelName(logger.level) == 'DEBUG'
+
+
+def test_connect_api_from_file(driver_wrapper):
     # Mock data
     expected_driver = None
 

toolium/test/test_driver_wrappers_pool.py

@@ -93,9 +93,9 @@ def test_connect_default_driver_wrapper_already_connected(driver_wrapper):
 
 
 close_drivers_scopes = (
-    ('function',),
-    ('module',),
-    ('session',),
+    'function',
+    'module',
+    'session',
 )