Skip to content

Commit 731ec66

Browse files
authored
test: update tests now that we don't post the survey link (#301)
1 parent 7f7e8da commit 731ec66

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

tests/test_pull_request_closed.py

+3-14
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
from openedx_webhooks.bot_comments import (
66
BotComment,
7-
is_comment_kind,
87
)
98
from openedx_webhooks.cla_check import (
109
CLA_CONTEXT,
@@ -52,16 +51,6 @@ def closed_pull_request(is_merged, fake_github, fake_jira):
5251
return pr
5352

5453

55-
def test_external_pr_closed(fake_jira, closed_pull_request):
56-
pr = closed_pull_request
57-
pull_request_changed(pr.as_json())
58-
59-
pr_comments = pr.list_comments()
60-
body = pr_comments[-1].body
61-
assert "survey" in body
62-
assert is_comment_kind(BotComment.SURVEY, body)
63-
64-
6554
def test_external_pr_closed_but_issue_deleted(fake_jira, closed_pull_request):
6655
# A closing pull request, but its Jira issue has been deleted.
6756
pr = closed_pull_request
@@ -70,7 +59,7 @@ def test_external_pr_closed_but_issue_deleted(fake_jira, closed_pull_request):
7059
assert not result.jira_issues
7160

7261
pr_comments = pr.list_comments()
73-
assert len(pr_comments) == 4 # 1 welcome, closed_pull_request makes two, 1 survey
62+
assert len(pr_comments) == 3 # 1 welcome, closed_pull_request makes two
7463
# We leave the old issue id in the comment.
7564
body = pr_comments[0].body
7665
check_issue_link_in_markdown(body, None)
@@ -98,13 +87,13 @@ def test_cc_pr_closed(fake_github, fake_jira, is_merged):
9887
pull_request_changed(pr.as_json())
9988

10089
pr_comments = pr.list_comments()
101-
assert len(pr_comments) == 2 # 1 welcome, 1 survey
90+
assert len(pr_comments) == 1 # welcome comment
10291

10392
# Processing it again won't change anything.
10493
pull_request_changed(pr.as_json())
10594

10695
pr_comments = pr.list_comments()
107-
assert len(pr_comments) == 2 # 1 welcome, 1 survey
96+
assert len(pr_comments) == 1 # welcome comment
10897

10998

11099
@pytest.mark.parametrize("org", ["openedx", "edx"])

tests/test_rescan.py

-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ def test_rescan_repository_dry_run(rescannable_repo, fake_github, fake_jira, pul
121121
],
122122
108: [
123123
"initial_state",
124-
"add_comment_to_pull_request", # "Even though your pull request wasn't merged"
125124
],
126125
110: [
127126
"initial_state",

0 commit comments

Comments
 (0)