Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions app_dart/lib/src/request_handlers/github/webhook_subscription.dart
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,11 @@ final class GithubWebhookSubscription extends SubscriptionHandler {
final result = await _processPullRequestClosed(pullRequestEvent);
return result.toResponse();
case 'edited':
await _addCICDForRollers(pullRequestEvent);
await _checkForTests(pullRequestEvent);
break;
case 'opened':
await _addCICDForRollers(pullRequestEvent);
await _checkForTests(pullRequestEvent);
await _tryReleaseApproval(pullRequestEvent);
break;
Expand Down Expand Up @@ -567,6 +569,17 @@ final class GithubWebhookSubscription extends SubscriptionHandler {
);
}

Future<void> _addCICDForRollers(PullRequestEvent pullRequestEvent) async {
final pr = pullRequestEvent.pullRequest!;
final slug = pr.base!.repo!.slug();

if (config.rollerAccounts.contains(pr.user!.login) &&
config.supportedRepos.contains(slug)) {
final gitHubClient = await config.createGitHubClient(pullRequest: pr);
await gitHubClient.issues.addLabelsToIssue(slug, pr.number!, ['CICD']);
}
}
Comment thread
jtmcdole marked this conversation as resolved.

Future<void> _checkForTests(PullRequestEvent pullRequestEvent) async {
final pr = pullRequestEvent.pullRequest!;
// We do not need to add test labels if this is an auto roller author.
Expand Down
111 changes: 36 additions & 75 deletions app_dart/test/request_handlers/github/webhook_subscription_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -879,95 +879,56 @@ void main() {
});

group(
'Auto-roller accounts do not label Framework PR with test label or comment.',
'Auto-roller accounts label Framework PR with CICD label, but no comment',
() {
final inputs = <String>{'skia-flutter-autoroll', 'dependabot'};
final inputs = <String>{
'skia-flutter-autoroll',
'dependabot',
'engine-flutter-autoroll',
};

for (var element in inputs) {
test(
'Framework does not label PR with no tests label if author is $element',
() async {
const issueNumber = 123;
test('if author is $element', () async {
const issueNumber = 123;

tester.message = generateGithubWebhookMessage(
action: 'opened',
number: issueNumber,
login: element,
);
tester.message = generateGithubWebhookMessage(
action: 'opened',
number: issueNumber,
login: element,
);

final slug = RepositorySlug('flutter', 'flutter');
final slug = RepositorySlug('flutter', 'flutter');

when(pullRequestsService.listFiles(slug, issueNumber)).thenAnswer(
(_) => Stream<PullRequestFile>.value(
PullRequestFile()..filename = 'packages/flutter/blah.dart',
),
);
when(pullRequestsService.listFiles(slug, issueNumber)).thenAnswer(
(_) => Stream<PullRequestFile>.value(
PullRequestFile()..filename = 'packages/flutter/blah.dart',
),
);

when(
issuesService.listCommentsByIssue(slug, issueNumber),
).thenAnswer(
(_) => Stream<IssueComment>.value(
IssueComment()..body = 'some other comment',
),
);
when(
issuesService.listCommentsByIssue(slug, issueNumber),
).thenAnswer(
(_) => Stream<IssueComment>.value(
IssueComment()..body = 'some other comment',
),
);

await tester.post(webhook);
await tester.post(webhook);

verifyNever(
issuesService.addLabelsToIssue(slug, issueNumber, any),
);
verify(issuesService.addLabelsToIssue(slug, issueNumber, ['CICD']));

verifyNever(
issuesService.createComment(
slug,
issueNumber,
argThat(contains(config.missingTestsPullRequestMessageValue)),
),
);
},
);
verifyNever(
issuesService.createComment(
slug,
issueNumber,
argThat(contains(config.missingTestsPullRequestMessageValue)),
),
);
});
}
},
);

test(
'Framework does not label PR with no tests label if author is engine-flutter-autoroll',
() async {
const issueNumber = 123;

tester.message = generateGithubWebhookMessage(
action: 'opened',
number: issueNumber,
login: 'engine-flutter-autoroll',
);
final slug = RepositorySlug('flutter', 'flutter');

when(pullRequestsService.listFiles(slug, issueNumber)).thenAnswer(
(_) => Stream<PullRequestFile>.value(
PullRequestFile()..filename = 'packages/flutter/blah.dart',
),
);

when(issuesService.listCommentsByIssue(slug, issueNumber)).thenAnswer(
(_) => Stream<IssueComment>.value(
IssueComment()..body = 'some other comment',
),
);

await tester.post(webhook);

verifyNever(issuesService.addLabelsToIssue(slug, issueNumber, any));

verifyNever(
issuesService.createComment(
slug,
issueNumber,
argThat(contains(config.missingTestsPullRequestMessageValue)),
),
);
},
);

test(
'Framework does not label PR with no tests label if file is test exempt',
() async {
Expand Down
Loading