Skip to content

Commit 94ecd6d

Browse files
committed
finally fixing slack sql and adding more tests for sentry app email
1 parent 90fd0ed commit 94ecd6d

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

src/sentry/web/frontend/debug/debug_notify_disable.py

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ def get(self, request: HttpRequest) -> HttpResponse:
1313
self.integration = Integration.objects.create(
1414
provider="slack",
1515
name="Awesome Team",
16-
external_id="TXXXXXXX",
1716
metadata={
1817
"access_token": "xoxb-xxxxxxxxx-xxxxxxxxxx-xxxxxxxxxxxx",
1918
"installation_type": "born_as_bot",

src/sentry/web/frontend/debug/debug_sentry_app_notify_disable.py

+8-5
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,33 @@
33

44
from sentry.constants import SentryAppStatus
55
from sentry.integrations.notify_disable import get_provider_type, get_url
6-
from sentry.models import Organization, SentryApp
6+
from sentry.models import Organization, SentryApp, SentryAppInstallation
77

88
from .mail import MailPreview
99

1010

1111
class DebugSentryAppNotifyDisableView(View):
1212
def get(self, request: HttpRequest) -> HttpResponse:
1313

14-
self.organization = Organization(id=1, slug="organization", name="My Company")
14+
self.organization = Organization(id=1, slug="sentry", name="My Company")
1515
self.sentry_app = SentryApp(
1616
name="Test App",
1717
events=["issue.resolved", "issue.ignored", "issue.assigned"],
1818
status=SentryAppStatus.INTERNAL,
1919
webhook_url="https://broken-example.com/webhook",
20+
slug="internal-35e455",
21+
)
22+
self.install = SentryAppInstallation(
23+
organization_id=self.organization.id, sentry_app=self.sentry_app
2024
)
2125

26+
redis_key = f"sentry-app-error:{self.install.uuid}"
2227
integration_name = self.sentry_app.name
2328
integration_link = get_url(
2429
self.organization,
25-
get_provider_type(f"sentry-app-error:{self.sentry_app.uuid}"),
30+
get_provider_type(redis_key),
2631
self.sentry_app.slug,
2732
)
28-
redis_key = f"sentry-app-error:{self.sentry_app.uuid}"
29-
3033
return MailPreview(
3134
html_template="sentry/integrations/sentry-app-notify-disable.html",
3235
text_template="sentry/integrations/sentry-app-notify-disable.txt",

tests/sentry/tasks/test_sentry_apps.py

+9
Original file line numberDiff line numberDiff line change
@@ -647,6 +647,7 @@ def setUp(self):
647647
name="Test App",
648648
organization=self.organization,
649649
events=["issue.resolved", "issue.ignored", "issue.assigned"],
650+
webhook_url="https://example.com",
650651
)
651652
self.sentry_app.update(status=SentryAppStatus.PUBLISHED)
652653

@@ -904,6 +905,7 @@ def test_notify_disabled_email(self):
904905
self.sentry_app.name,
905906
get_redis_key(self.sentry_app, self.organization.id),
906907
self.sentry_app.slug,
908+
self.sentry_app.webhook_url,
907909
)
908910
assert len(mail.outbox) == 1
909911
msg = mail.outbox[0]
@@ -917,3 +919,10 @@ def test_notify_disabled_email(self):
917919
)
918920
in msg.body
919921
)
922+
assert (
923+
self.organization.absolute_url(
924+
f"/settings/{self.organization.slug}/developer-settings/{self.sentry_app.slug}/dashboard"
925+
)
926+
in msg.body
927+
)
928+
assert (self.sentry_app.webhook_url) in msg.body

0 commit comments

Comments
 (0)