diff --git a/static/images/integrations/gitea/001.png b/static/images/integrations/gitea/001.png index 2500b8b0d3..a6dd9a084b 100644 Binary files a/static/images/integrations/gitea/001.png and b/static/images/integrations/gitea/001.png differ diff --git a/zerver/webhooks/gitea/fixtures/pull_request__merged.json b/zerver/webhooks/gitea/fixtures/pull_request__merged.json index f341d24008..ff36828ad2 100644 --- a/zerver/webhooks/gitea/fixtures/pull_request__merged.json +++ b/zerver/webhooks/gitea/fixtures/pull_request__merged.json @@ -5,7 +5,7 @@ "pull_request": { "id": 1905, "url": "https://try.gitea.io/kostekIV/test/pulls/4", - "number": 4, + "number": 1905, "user": { "id": 21818, "login": "kostekIV", @@ -18,7 +18,7 @@ "created": "2019-11-15T19:17:02Z", "username": "kostekIV" }, - "title": "New pr", + "title": "Fix remove-op on reaction event", "body": "Body", "labels": [], "milestone": null, @@ -47,7 +47,7 @@ }, "base": { "label": "master", - "ref": "master", + "ref": "main", "sha": "1d40c3be7919f066f9158eaaaecaf696b3e22886", "repo_id": 14576, "repo": { @@ -110,7 +110,7 @@ }, "head": { "label": "test-branch", - "ref": "test-branch", + "ref": "reaction-metadata", "sha": "01efc1fe09d4fba25397a386a6c623fd12eadd79", "repo_id": 14576, "repo": { @@ -191,7 +191,7 @@ "created": "2019-11-15T19:17:02Z", "username": "kostekIV" }, - "name": "test", + "name": "zulip-terminal", "full_name": "kostekIV/test", "description": "", "empty": false, diff --git a/zerver/webhooks/gitea/tests.py b/zerver/webhooks/gitea/tests.py index 20733b6790..ff06fc7759 100644 --- a/zerver/webhooks/gitea/tests.py +++ b/zerver/webhooks/gitea/tests.py @@ -30,8 +30,8 @@ class GiteaHookTests(WebhookTestCase): self.check_webhook("pull_request__opened", expected_topic_name, expected_message) def test_pull_request_merged(self) -> None: - expected_topic_name = "test / PR #1905 New pr" - expected_message = """kostekIV merged [PR #4](https://try.gitea.io/kostekIV/test/pulls/4) from `test-branch` to `master`.""" + expected_topic_name = "zulip-terminal / PR #1905 Fix remove-op on reaction event" + expected_message = """kostekIV merged [PR #1905](https://try.gitea.io/kostekIV/test/pulls/4) from `reaction-metadata` to `main`.""" self.check_webhook("pull_request__merged", expected_topic_name, expected_message) def test_pull_request_edited(self) -> None: