Skip to content

armgit / zulip

Public Imported from GitHub
0

Zulip server and web application. Open-source team chat that helps teams stay productive and focused.

webhooks/gitlab: Remove redundant Release Hook fixtures.

Niloth Pbd0f92e1d2ae
diff --git a/zerver/webhooks/gitlab/fixtures/release_hook__create.json b/zerver/webhooks/gitlab/fixtures/release_hook.json
similarity index 100%
rename from zerver/webhooks/gitlab/fixtures/release_hook__create.json
rename to zerver/webhooks/gitlab/fixtures/release_hook.json
diff --git a/zerver/webhooks/gitlab/fixtures/release_hook__delete.json b/zerver/webhooks/gitlab/fixtures/release_hook__delete.json
deleted file mode 100644
index 97cc3ebf5b6..00000000000
--- a/zerver/webhooks/gitlab/fixtures/release_hook__delete.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
- "id": 1,
- "created_at": "2020-11-02 12:55:12 UTC",
- "description": "## v1.1 (2024-09-06)\n\n- Feature added",
- "name": "v1.1",
- "released_at": "2020-11-02 12:55:12 UTC",
- "tag": "v1.1",
- "object_kind": "release",
- "project": {
- "id": 2,
- "name": "release-webhook-example",
- "description": "",
- "web_url": "https://example.com/gitlab-org/release-webhook-example",
- "avatar_url": null,
- "git_ssh_url": "ssh://[email protected]/gitlab-org/release-webhook-example.git",
- "git_http_url": "https://example.com/gitlab-org/release-webhook-example.git",
- "namespace": "Gitlab",
- "visibility_level": 0,
- "path_with_namespace": "gitlab-org/release-webhook-example",
- "default_branch": "master",
- "ci_config_path": null,
- "homepage": "https://example.com/gitlab-org/release-webhook-example",
- "url": "ssh://[email protected]/gitlab-org/release-webhook-example.git",
- "ssh_url": "ssh://[email protected]/gitlab-org/release-webhook-example.git",
- "http_url": "https://example.com/gitlab-org/release-webhook-example.git"
- },
- "url": "https://example.com/gitlab-org/release-webhook-example/-/releases/v1.1",
- "action": "delete",
- "assets": {
- "count": 5,
- "links": [
- {
- "id": 1,
- "link_type": "other",
- "name": "Changelog",
- "url": "https://example.net/changelog"
- }
- ],
- "sources": [
- {
- "format": "zip",
- "url": "https://example.com/gitlab-org/release-webhook-example/-/archive/v1.1/release-webhook-example-v1.1.zip"
- },
- {
- "format": "tar.gz",
- "url": "https://example.com/gitlab-org/release-webhook-example/-/archive/v1.1/release-webhook-example-v1.1.tar.gz"
- },
- {
- "format": "tar.bz2",
- "url": "https://example.com/gitlab-org/release-webhook-example/-/archive/v1.1/release-webhook-example-v1.1.tar.bz2"
- },
- {
- "format": "tar",
- "url": "https://example.com/gitlab-org/release-webhook-example/-/archive/v1.1/release-webhook-example-v1.1.tar"
- }
- ]
- },
- "commit": {
- "id": "ee0a3fb31ac16e11b9dbb596ad16d4af654d08f8",
- "message": "Release v1.1",
- "title": "Release v1.1",
- "timestamp": "2020-10-31T14:58:32+11:00",
- "url": "https://example.com/gitlab-org/release-webhook-example/-/commit/ee0a3fb31ac16e11b9dbb596ad16d4af654d08f8",
- "author": {
- "name": "Example User",
- "email": "[email protected]"
- }
- }
-}
diff --git a/zerver/webhooks/gitlab/fixtures/release_hook__update.json b/zerver/webhooks/gitlab/fixtures/release_hook__update.json
deleted file mode 100644
index b0b83746a70..00000000000
--- a/zerver/webhooks/gitlab/fixtures/release_hook__update.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
- "id": 1,
- "created_at": "2020-11-02 12:55:12 UTC",
- "description": "## v1.1 (2024-09-06)\n\n- Feature added",
- "name": "v1.1",
- "released_at": "2020-11-02 12:55:12 UTC",
- "tag": "v1.1",
- "object_kind": "release",
- "project": {
- "id": 2,
- "name": "release-webhook-example",
- "description": "",
- "web_url": "https://example.com/gitlab-org/release-webhook-example",
- "avatar_url": null,
- "git_ssh_url": "ssh://[email protected]/gitlab-org/release-webhook-example.git",
- "git_http_url": "https://example.com/gitlab-org/release-webhook-example.git",
- "namespace": "Gitlab",
- "visibility_level": 0,
- "path_with_namespace": "gitlab-org/release-webhook-example",
- "default_branch": "master",
- "ci_config_path": null,
- "homepage": "https://example.com/gitlab-org/release-webhook-example",
- "url": "ssh://[email protected]/gitlab-org/release-webhook-example.git",
- "ssh_url": "ssh://[email protected]/gitlab-org/release-webhook-example.git",
- "http_url": "https://example.com/gitlab-org/release-webhook-example.git"
- },
- "url": "https://example.com/gitlab-org/release-webhook-example/-/releases/v1.1",
- "action": "update",
- "assets": {
- "count": 5,
- "links": [
- {
- "id": 1,
- "link_type": "other",
- "name": "Changelog",
- "url": "https://example.net/changelog"
- }
- ],
- "sources": [
- {
- "format": "zip",
- "url": "https://example.com/gitlab-org/release-webhook-example/-/archive/v1.1/release-webhook-example-v1.1.zip"
- },
- {
- "format": "tar.gz",
- "url": "https://example.com/gitlab-org/release-webhook-example/-/archive/v1.1/release-webhook-example-v1.1.tar.gz"
- },
- {
- "format": "tar.bz2",
- "url": "https://example.com/gitlab-org/release-webhook-example/-/archive/v1.1/release-webhook-example-v1.1.tar.bz2"
- },
- {
- "format": "tar",
- "url": "https://example.com/gitlab-org/release-webhook-example/-/archive/v1.1/release-webhook-example-v1.1.tar"
- }
- ]
- },
- "commit": {
- "id": "ee0a3fb31ac16e11b9dbb596ad16d4af654d08f8",
- "message": "Release v1.1",
- "title": "Release v1.1",
- "timestamp": "2020-10-31T14:58:32+11:00",
- "url": "https://example.com/gitlab-org/release-webhook-example/-/commit/ee0a3fb31ac16e11b9dbb596ad16d4af654d08f8",
- "author": {
- "name": "Example User",
- "email": "[email protected]"
- }
- }
-}
diff --git a/zerver/webhooks/gitlab/tests.py b/zerver/webhooks/gitlab/tests.py
index a8109218184..030a1080e4f 100644
--- a/zerver/webhooks/gitlab/tests.py
+++ b/zerver/webhooks/gitlab/tests.py
@@ -630,30 +630,37 @@ A trivial change that should probably be ignored.
"merge_request_hook__merge_request_unapproved", expected_topic_name, expected_message
)
- def test_release_created_event_message(self) -> None:
+ def test_release_event_messages(self) -> None:
+ release_url = "https://example.com/gitlab-org/release-webhook-example/-/releases/v1.1"
+ release_description = "\n``` quote\n## v1.1 (2024-09-06)\n\n- Feature added\n```"
expected_topic_name = "release-webhook-example"
- expected_message = "Release [v1.1](https://example.com/gitlab-org/release-webhook-example/-/releases/v1.1) for tag v1.1 was created.\n``` quote\n## v1.1 (2024-09-06)\n\n- Feature added\n```"
+ test_cases = [
+ (
+ "create",
+ f"Release [v1.1]({release_url}) for tag v1.1 was created.{release_description}",
+ ),
+ (
+ "update",
+ f"Release [v1.1]({release_url}) for tag v1.1 was updated.{release_description}",
+ ),
+ ("delete", "Release v1.1 for tag v1.1 was deleted."),
+ ]
+
+ payload = orjson.loads(self.get_body("release_hook"))
- self.check_webhook("release_hook__create", expected_topic_name, expected_message)
+ for action, expected_message in test_cases:
+ with self.subTest(action=action):
+ payload["action"] = action
+ self.check_webhook(
+ "release_hook", expected_topic_name, expected_message, custom_payload=payload
+ )
def test_release_created_event_message_custom_topic_in_url(self) -> None:
self.url = self.build_webhook_url("topic=Specific%20topic")
expected_topic_name = "Specific topic"
expected_message = "[[release-webhook-example](https://example.com/gitlab-org/release-webhook-example)] Release [v1.1](https://example.com/gitlab-org/release-webhook-example/-/releases/v1.1) for tag v1.1 was created.\n``` quote\n## v1.1 (2024-09-06)\n\n- Feature added\n```"
- self.check_webhook("release_hook__create", expected_topic_name, expected_message)
-
- def test_release_update_event_message(self) -> None:
- expected_topic_name = "release-webhook-example"
- expected_message = "Release [v1.1](https://example.com/gitlab-org/release-webhook-example/-/releases/v1.1) for tag v1.1 was updated.\n``` quote\n## v1.1 (2024-09-06)\n\n- Feature added\n```"
-
- self.check_webhook("release_hook__update", expected_topic_name, expected_message)
-
- def test_release_delete_event_message(self) -> None:
- expected_topic_name = "release-webhook-example"
- expected_message = "Release v1.1 for tag v1.1 was deleted."
-
- self.check_webhook("release_hook__delete", expected_topic_name, expected_message)
+ self.check_webhook("release_hook", expected_topic_name, expected_message)
def test_feature_flag_activate_event_message(self) -> None:
expected_topic_name = "sample"