Adapt tests to new test structure

ARCHITECTURE.md

@@ -15,6 +15,7 @@ sequenceDiagram
     App->>Jira: Searches for existing Jira issues
     Jira->>App: Provides list of existing issues if any
     App->>Jira: Creates/updates Jira issue
+    App->>repo: (Optional) Adds 'synced-to-jira' on the Issue
     App->>repo: (Optional) Adds a comment on the Issue
     App->>GH: Returns web response
 
@@ -54,4 +55,4 @@ sequenceDiagram
     App1->>repo: (Optional) Adds a comment on the Issue
     App1->>GH: Returns web response
 
-```
+```

github_jira_sync_app/main.py

@@ -303,7 +303,7 @@ async def bot(request: Request, payload: dict = Body(...)):
         if settings["add_gh_synced_label"]:
             try:
                 repo.get_label(gh_synced_label_name)
-                issue.add_to_labels(gh_synced_label_name)
+                gh_issue.add_to_labels(gh_synced_label_name)
             except UnknownObjectException:
                 logger.warning(nonexistent_gh_label_warning)
                 synced_label_absent_in_repo = True

tests/unit/test_server.py

@@ -248,15 +248,20 @@ def test_issue_created_and_sync_label_added(signature_mock):
         8. Validate that synced-to-jira label exists in repo
         9. Add synced-to-jira label to the issue
     """
+
+    responses._add_from_file(UNITTESTS_DIR / "url_responses" / "github_auth.yaml")
+    responses._add_from_file(
+        UNITTESTS_DIR / "url_responses" / "github_settings_with_gh_sync_label.yaml"
+    )
     responses._add_from_file(
-        UNITTESTS_DIR / "url_responses" / "auth_github_responses_sync_label.yaml"
+        UNITTESTS_DIR / "url_responses" / "github_responses_synced_label_exists.yaml"
     )
+    responses._add_from_file(UNITTESTS_DIR / "url_responses" / "jira_jql_no_issues.yaml")
     responses._add_from_file(UNITTESTS_DIR / "url_responses" / "jira_auth_responses.yaml")
-    responses._add_from_file(UNITTESTS_DIR / "url_responses" / "issue_labeled_correct.yaml")
     responses._add_from_file(UNITTESTS_DIR / "url_responses" / "jira_create_issue.yaml")
     response = client.post(
         "/",
-        json=_get_json("issue_created_with_label.json"),
+        json=_get_json("issue_created_without_label.json"),
     )
 
     assert response.status_code == 200
@@ -280,15 +285,19 @@ def test_issue_created_and_sync_label_not_present(signature_mock):
         9. Label doesn't exist, warning comment is added to GitHub issue even though
            <add_gh_comment> is false
     """
+    responses._add_from_file(UNITTESTS_DIR / "url_responses" / "github_auth.yaml")
+    responses._add_from_file(
+        UNITTESTS_DIR / "url_responses" / "github_settings_with_gh_sync_label.yaml"
+    )
     responses._add_from_file(
-        UNITTESTS_DIR / "url_responses" / "auth_github_responses_sync_label_not_found.yaml"
+        UNITTESTS_DIR / "url_responses" / "github_responses_synced_label_notfound.yaml"
     )
+    responses._add_from_file(UNITTESTS_DIR / "url_responses" / "jira_jql_no_issues.yaml")
     responses._add_from_file(UNITTESTS_DIR / "url_responses" / "jira_auth_responses.yaml")
-    responses._add_from_file(UNITTESTS_DIR / "url_responses" / "issue_labeled_correct.yaml")
     responses._add_from_file(UNITTESTS_DIR / "url_responses" / "jira_create_issue.yaml")
     response = client.post(
         "/",
-        json=_get_json("issue_created_with_label.json"),
+        json=_get_json("issue_created_without_label.json"),
     )
 
     assert response.status_code == 200