refactor: change type of parameters

Change type of parameters for the constructor of reporters.

qase-python-commons/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "qase-python-commons"
-version = "3.1.0b1"
+version = "3.1.0b2"
 description = "A library for Qase TestOps and Qase Report"
 readme = "README.md"
 authors = [{name = "Qase Team", email = "[email protected]"}]

qase-python-commons/src/qase/commons/reporters/core.py

@@ -38,13 +38,13 @@ def __init__(self, config: ConfigManager):
         if mode == Mode.testops:
             try:
                 self._load_testops_plan()
-                self.reporter = QaseTestOps(config=config, logger=self.logger)
+                self.reporter = QaseTestOps(config=self.config, logger=self.logger)
             except Exception as e:
                 self.logger.log('Failed to initialize TestOps reporter. Using fallback.', 'info')
                 self.logger.log(e, 'error')
                 self.reporter = self.fallback
         elif mode == Mode.report:
-            self.reporter = QaseReport(config=config, logger=self.logger)
+            self.reporter = QaseReport(config=self.config, logger=self.logger)
         else:
             self.reporter = None
 

qase-python-commons/src/qase/commons/reporters/report.py

@@ -4,20 +4,21 @@
 import json
 import re
 from ..models import Result, Run, Attachment
-from .. import QaseUtils, ConfigManager, Logger
+from .. import QaseUtils, Logger
 from ..models.config.connection import Format
+from ..models.config.qaseconfig import QaseConfig
 
 
 class QaseReport:
     def __init__(
             self,
-            config: ConfigManager,
+            config: QaseConfig,
             logger: Logger
     ):
         self.duration = 0
         self.results = []
         self.attachments = []
-        self.config = config.config
+        self.config = config
         self.logger = logger
 
         self.report_path = self.config.report.connection.path

qase-python-commons/src/qase/commons/reporters/testops.py

@@ -2,19 +2,20 @@
 
 from datetime import datetime
 from typing import List
-from .. import ConfigManager, Logger, ReporterException
+from .. import Logger, ReporterException
 from ..client.api_v1_client import ApiV1Client
 from ..client.base_api_client import BaseApiClient
 from ..models import Result
+from ..models.config.qaseconfig import QaseConfig
 
 DEFAULT_BATCH_SIZE = 200
 DEFAULT_THREAD_COUNT = 4
 
 
 class QaseTestOps:
 
-    def __init__(self, config: ConfigManager, logger: Logger) -> None:
-        self.config = config.config
+    def __init__(self, config: QaseConfig, logger: Logger) -> None:
+        self.config = config
         self.logger = logger
 
         self.client = self._prepare_client()

qase-python-commons/tests/tests_qase_commons/test_report.py

@@ -12,7 +12,7 @@ def test_QaseReport_init():
     config.config.report.connection.format = Format.json
     config.config.environment = "env1"
 
-    report = QaseReport(config, logger)
+    report = QaseReport(config.config, logger)
     assert report.report_path == "custom_path"
     assert report.format == Format.json
     assert report.environment == "env1"
@@ -24,7 +24,7 @@ def test_QaseReport_init():
 def test_QaseReport_start_run(mock_exists, mock_rmtree, mock_makedirs):
     logger = Logger()
     config = ConfigManager()
-    report = QaseReport(config, logger)
+    report = QaseReport(config.config, logger)
     report.start_run()
     assert mock_exists.called
     assert mock_rmtree.called
@@ -38,7 +38,7 @@ def test_QaseReport_start_run(mock_exists, mock_rmtree, mock_makedirs):
 def test_QaseReport_check_report_path(mock_makedirs, mock_rmtree, mock_exists):
     logger = Logger()
     config = ConfigManager()
-    report = QaseReport(config, logger)
+    report = QaseReport(config.config, logger)
     report._check_report_path()
     assert mock_exists.called
     assert mock_rmtree.called
@@ -51,7 +51,7 @@ def test_QaseReport_check_report_path(mock_makedirs, mock_rmtree, mock_exists):
 def test_QaseReport_recreate_dir(mock_makedirs, mock_rmtree, mock_exists):
     logger = Logger()
     config = ConfigManager()
-    report = QaseReport(config, logger)
+    report = QaseReport(config.config, logger)
     report._recreate_dir("some_path")
     assert mock_exists.called
     assert mock_rmtree.called
@@ -62,7 +62,7 @@ def test_QaseReport_recreate_dir(mock_makedirs, mock_rmtree, mock_exists):
 def test_QaseReport_store_object(mock_open):
     logger = Logger()
     config = ConfigManager()
-    report = QaseReport(config, logger)
+    report = QaseReport(config.config, logger)
     mock_object = MagicMock()
     mock_object.to_json.return_value = '{"key": "value"}'
     report._store_object(mock_object, "/path", "filename")