Skip to content

Commit 7f9ae57

Browse files
authored
Merge pull request #8709 from Couchers-org/backend/feature/bugs-markdown
Backend/bugs: Use markdown to format GitHub issues
2 parents 6e933e2 + f7fe70d commit 7f9ae57

2 files changed

Lines changed: 46 additions & 19 deletions

File tree

app/backend/src/couchers/servicers/bugs.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,20 @@ def ReportBug(
4747

4848
issue_title = request.subject
4949
issue_body = (
50-
f"Subject: {request.subject}\n"
51-
f"Description:\n"
50+
f"# {request.subject}\n"
51+
f"## Description\n"
5252
f"{request.description}\n"
5353
f"\n"
54-
f"Results:\n"
54+
f"## Results\n"
5555
f"{request.results}\n"
5656
f"\n"
57-
f"Backend version: {self._version()}\n"
58-
f"Frontend version: {request.frontend_version}\n"
59-
f"User Agent: {request.user_agent}\n"
60-
f"Screen resolution: {request.screen_resolution.width}x{request.screen_resolution.height}\n"
61-
f"Page: {request.page}\n"
62-
f"User: {user_details}"
57+
f"## Diagnostics\n"
58+
f"**Backend version**: `{self._version()}`\n"
59+
f"**Frontend version**: `{request.frontend_version}`\n"
60+
f"**User Agent**: `{request.user_agent}`\n"
61+
f"**Screen resolution**: {request.screen_resolution.width}x{request.screen_resolution.height}\n"
62+
f"**Page**: {request.page}\n"
63+
f"**User**: {user_details}"
6364
)
6465
issue_labels = ["bug tool", "bug: triage needed"]
6566

app/backend/src/tests/test_bugs.py

Lines changed: 36 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,26 @@ def test_bugs(db):
4141
def dud_post(url, auth, json):
4242
assert url == "https://api.github.com/repos/org/repo/issues"
4343
assert auth == ("user", "token")
44+
45+
expected_body = f"""
46+
# subject
47+
## Description
48+
description
49+
50+
## Results
51+
results
52+
53+
## Diagnostics
54+
**Backend version**: `{config["VERSION"]}`
55+
**Frontend version**: `frontend_version`
56+
**User Agent**: `user_agent`
57+
**Screen resolution**: 1920x1080
58+
**Page**: page
59+
**User**: <not logged in>""".strip()
60+
4461
assert json == {
4562
"title": "subject",
46-
"body": (
47-
"Subject: subject\nDescription:\ndescription\n\nResults:\nresults\n\nBackend version: "
48-
+ config["VERSION"]
49-
+ "\nFrontend version: frontend_version\nUser Agent: user_agent\nScreen resolution: 1920x1080\nPage: page\nUser: <not logged in>"
50-
),
63+
"body": expected_body,
5164
"labels": ["bug tool", "bug: triage needed"],
5265
}
5366

@@ -88,13 +101,26 @@ def test_bugs_with_user(db):
88101
def dud_post(url, auth, json):
89102
assert url == "https://api.github.com/repos/org/repo/issues"
90103
assert auth == ("user", "token")
104+
105+
expected_body = f"""
106+
# subject
107+
## Description
108+
description
109+
110+
## Results
111+
results
112+
113+
## Diagnostics
114+
**Backend version**: `{config["VERSION"]}`
115+
**Frontend version**: `frontend_version`
116+
**User Agent**: `user_agent`
117+
**Screen resolution**: 390x844
118+
**Page**: page
119+
**User**: [@testing_user](http://localhost:3000/user/testing_user) (1)""".strip()
120+
91121
assert json == {
92122
"title": "subject",
93-
"body": (
94-
"Subject: subject\nDescription:\ndescription\n\nResults:\nresults\n\nBackend version: "
95-
+ config["VERSION"]
96-
+ "\nFrontend version: frontend_version\nUser Agent: user_agent\nScreen resolution: 390x844\nPage: page\nUser: [@testing_user](http://localhost:3000/user/testing_user) (1)"
97-
),
123+
"body": expected_body,
98124
"labels": ["bug tool", "bug: triage needed"],
99125
}
100126

0 commit comments

Comments
 (0)