Merge pull request #38 from everactive/master

Minor fixes to support the latest changes in Xray Cloud
fundakol · Mar 9, 2022 · 3d155b1 · 3d155b1
2 parents feade9b + e56691e
commit 3d155b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/pytest_xray/xray_publisher.py b/src/pytest_xray/xray_publisher.py
@@ -45,7 +45,7 @@ def __call__(self, r: requests.PreparedRequest) -> requests.PreparedRequest:
             _logger.exception(err_message)
             raise XrayError(err_message) from exc
         else:
-            auth_token = response.text
+            auth_token = response.text.replace('"', '')
             r.headers['Authorization'] = f'Bearer {auth_token}'
         return r
 
@@ -114,5 +114,6 @@ def publish(self, data: dict) -> str:
         :return: test execution issue id
         """
         response_data = self._send_data(self.endpoint_url, self.auth, data)
-        key = response_data['testExecIssue']['key']
+        # The Xray cloud response does not include the 'testExecIssue' attribute
+        key = response_data['testExecIssue']['key'] if 'testExecIssue' in response_data else response_data['key']
         return key
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -27,7 +27,7 @@ def http_server(environment_variables):
     # cloud
     server.add_json_response(
         '/api/v2/import/execution',
-        {'testExecIssue': {'key': '1000'}},
+        {'key': '1000'},
         methods=('POST',)
     )
     server.add_callback_response(