forked from openjdk/skara
-
Notifications
You must be signed in to change notification settings - Fork 0
/
IntegrateTests.java
585 lines (492 loc) · 29.8 KB
/
IntegrateTests.java
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
/*
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package org.openjdk.skara.bots.pr;
import org.openjdk.skara.forge.*;
import org.openjdk.skara.issuetracker.Comment;
import org.openjdk.skara.test.*;
import org.openjdk.skara.vcs.Repository;
import org.junit.jupiter.api.*;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.*;
import java.util.Set;
import java.util.stream.Collectors;
import static org.junit.jupiter.api.Assertions.*;
class IntegrateTests {
@Test
void simpleMerge(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo);
var tempFolder = new TemporaryDirectory();
var pushedFolder = new TemporaryDirectory()) {
var author = credentials.getHostedRepository();
var integrator = credentials.getHostedRepository();
var reviewer = credentials.getHostedRepository();
var censusBuilder = credentials.getCensusBuilder()
.addCommitter(author.forge().currentUser().id())
.addReviewer(integrator.forge().currentUser().id())
.addReviewer(reviewer.forge().currentUser().id());
var mergeBot = new PullRequestBot(integrator, censusBuilder.build(), "master");
// Populate the projects repository
var localRepo = CheckableRepository.init(tempFolder.path(), author.repositoryType());
var masterHash = localRepo.resolve("master").orElseThrow();
assertFalse(CheckableRepository.hasBeenEdited(localRepo));
localRepo.push(masterHash, author.url(), "master", true);
// Make a change with a corresponding PR
var editHash = CheckableRepository.appendAndCommit(localRepo);
localRepo.push(editHash, author.url(), "refs/heads/edit", true);
var pr = credentials.createPullRequest(author, "master", "edit", "This is a pull request");
// Approve it as another user
var approvalPr = integrator.pullRequest(pr.id());
approvalPr.addReview(Review.Verdict.APPROVED, "Approved");
// Attempt a merge (the bot should only process the first one)
pr.addComment("/integrate");
pr.addComment("/integrate");
pr.addComment("/integrate");
TestBotRunner.runPeriodicItems(mergeBot);
// The bot should reply with an ok message
var pushed = pr.comments().stream()
.filter(comment -> comment.body().contains("Pushed as commit"))
.count();
assertEquals(1, pushed);
// The change should now be present on the master branch
var pushedRepo = Repository.materialize(pushedFolder.path(), author.url(), "master");
assertTrue(CheckableRepository.hasBeenEdited(pushedRepo));
var headHash = pushedRepo.resolve("HEAD").orElseThrow();
var headCommit = pushedRepo.commits(headHash.hex() + "^.." + headHash.hex()).asList().get(0);
// Author and committer should be the same
assertEquals("Generated Committer 1", headCommit.author().name());
assertEquals("integrationcommitter1@openjdk.java.net", headCommit.author().email());
assertEquals("Generated Committer 1", headCommit.committer().name());
assertEquals("integrationcommitter1@openjdk.java.net", headCommit.committer().email());
assertTrue(pr.labels().contains("integrated"));
// Ready label should have been removed
assertFalse(pr.labels().contains("ready"));
}
}
@Test
void reviewersRetained(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo);
var tempFolder = new TemporaryDirectory();
var pushedFolder = new TemporaryDirectory()) {
var author = credentials.getHostedRepository();
var integrator = credentials.getHostedRepository();
var committer = credentials.getHostedRepository();
var censusBuilder = credentials.getCensusBuilder()
.addCommitter(author.forge().currentUser().id())
.addCommitter(committer.forge().currentUser().id())
.addReviewer(integrator.forge().currentUser().id());
var mergeBot = new PullRequestBot(integrator, censusBuilder.build(), "master");
// Populate the projects repository
var localRepo = CheckableRepository.init(tempFolder.path(), author.repositoryType());
var masterHash = localRepo.resolve("master").orElseThrow();
assertFalse(CheckableRepository.hasBeenEdited(localRepo));
localRepo.push(masterHash, author.url(), "master", true);
// Make a change with a corresponding PR
var editHash = CheckableRepository.appendAndCommit(localRepo);
localRepo.push(editHash, author.url(), "refs/heads/edit", true);
var pr = credentials.createPullRequest(author, "master", "edit", "This is a pull request");
// Review it twice
var integratorPr = integrator.pullRequest(pr.id());
var committerPr = committer.pullRequest(pr.id());
integratorPr.addReview(Review.Verdict.APPROVED, "Approved");
committerPr.addReview(Review.Verdict.APPROVED, "Approved");
// Attempt a merge
pr.addComment("/integrate");
TestBotRunner.runPeriodicItems(mergeBot);
// The bot should reply with an ok message
var pushed = pr.comments().stream()
.filter(comment -> comment.body().contains("Pushed as commit"))
.count();
assertEquals(1, pushed);
// The change should now be present on the master branch
var pushedRepo = Repository.materialize(pushedFolder.path(), author.url(), "master");
assertTrue(CheckableRepository.hasBeenEdited(pushedRepo));
var headCommit = pushedRepo.commits("HEAD").asList().get(0);
assertTrue(String.join("", headCommit.message())
.matches(".*Reviewed-by: integrationreviewer3, integrationcommitter2$"),
String.join("", headCommit.message()));
}
}
@Test
void notChecked(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo);
var tempFolder = new TemporaryDirectory()) {
var author = credentials.getHostedRepository();
var integrator = credentials.getHostedRepository();
var censusBuilder = credentials.getCensusBuilder()
.addAuthor(author.forge().currentUser().id());
var mergeBot = new PullRequestBot(integrator, censusBuilder.build(), "master");
// Populate the projects repository
var localRepo = CheckableRepository.init(tempFolder.path(), author.repositoryType());
var masterHash = localRepo.resolve("master").orElseThrow();
assertFalse(CheckableRepository.hasBeenEdited(localRepo));
localRepo.push(masterHash, author.url(), "master", true);
// Make a change with a corresponding PR
var editHash = CheckableRepository.appendAndCommit(localRepo);
localRepo.push(editHash, author.url(), "refs/heads/edit", true);
var pr = credentials.createPullRequest(author, "master", "edit", "This is a pull request");
// Attempt a merge, do not run the check from the bot
pr.addComment("/integrate");
TestBotRunner.runPeriodicItems(mergeBot, item -> item instanceof CheckWorkItem);
// The bot should reply with an error message
var error = pr.comments().stream()
.filter(comment -> comment.body().contains("merge request cannot be fulfilled at this time"))
.filter(comment -> comment.body().contains("status check"))
.filter(comment -> comment.body().contains("has not been performed on commit"))
.count();
assertEquals(1, error);
}
}
@Test
void notReviewed(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo);
var tempFolder = new TemporaryDirectory()) {
var author = credentials.getHostedRepository();
var integrator = credentials.getHostedRepository();
var censusBuilder = credentials.getCensusBuilder()
.addAuthor(author.forge().currentUser().id());
var mergeBot = new PullRequestBot(integrator, censusBuilder.build(), "master");
// Populate the projects repository - but without any checks enabled
var localRepo = CheckableRepository.init(tempFolder.path(), author.repositoryType(), Path.of("appendable.txt"),
Set.of(), null);
var masterHash = localRepo.resolve("master").orElseThrow();
assertFalse(CheckableRepository.hasBeenEdited(localRepo));
localRepo.push(masterHash, author.url(), "master", true);
// Make a change with a corresponding PR
var editHash = CheckableRepository.appendAndCommit(localRepo);
localRepo.push(editHash, author.url(), "refs/heads/edit", true);
var pr = credentials.createPullRequest(author, "master", "edit", "This is a pull request");
// Now enable checks
localRepo.checkout(masterHash, true);
CheckableRepository.init(tempFolder.path(), author.repositoryType(), Path.of("appendable.txt"),
Set.of("author", "reviewers", "whitespace"), null);
var updatedHash = localRepo.resolve("HEAD").orElseThrow();
localRepo.push(updatedHash, author.url(), "master", true);
// Attempt a merge
pr.addComment("/integrate");
TestBotRunner.runPeriodicItems(mergeBot);
// The bot should reply with an error message
var error = pr.comments().stream()
.filter(comment -> comment.body().contains("merge request cannot be fulfilled at this time"))
.filter(comment -> comment.body().contains("failed the final jcheck"))
.count();
assertEquals(1, error, pr.comments().stream().map(Comment::body).collect(Collectors.joining("\n---\n")));
}
}
@Test
void failedCheck(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo);
var tempFolder = new TemporaryDirectory()) {
var author = credentials.getHostedRepository();
var integrator = credentials.getHostedRepository();
var censusBuilder = credentials.getCensusBuilder()
.addAuthor(author.forge().currentUser().id());
var mergeBot = new PullRequestBot(integrator, censusBuilder.build(), "master");
// Populate the projects repository
var localRepo = CheckableRepository.init(tempFolder.path(), author.repositoryType());
var masterHash = localRepo.resolve("master").orElseThrow();
assertFalse(CheckableRepository.hasBeenEdited(localRepo));
localRepo.push(masterHash, author.url(), "master", true);
// Make a change with a corresponding PR
var editHash = CheckableRepository.appendAndCommit(localRepo, "trailing whitespace ");
localRepo.push(editHash, author.url(), "refs/heads/edit", true);
var pr = credentials.createPullRequest(author, "master", "edit", "This is a pull request");
// Attempt a merge
pr.addComment("/integrate");
TestBotRunner.runPeriodicItems(mergeBot);
// The bot should reply with an error message
var error = pr.comments().stream()
.filter(comment -> comment.body().contains("merge request cannot be fulfilled at this time"))
.filter(comment -> comment.body().contains("status check"))
.filter(comment -> comment.body().contains("did not complete successfully"))
.count();
assertEquals(1, error);
}
}
@Test
void outdatedCheck(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo);
var tempFolder = new TemporaryDirectory()) {
var author = credentials.getHostedRepository();
var integrator = credentials.getHostedRepository();
var censusBuilder = credentials.getCensusBuilder()
.addAuthor(author.forge().currentUser().id());
var mergeBot = new PullRequestBot(integrator, censusBuilder.build(), "master");
// Populate the projects repository
var localRepo = CheckableRepository.init(tempFolder.path(), author.repositoryType());
var masterHash = localRepo.resolve("master").orElseThrow();
assertFalse(CheckableRepository.hasBeenEdited(localRepo));
localRepo.push(masterHash, author.url(), "master", true);
// Make a change with a corresponding PR
var editHash = CheckableRepository.appendAndCommit(localRepo);
localRepo.push(editHash, author.url(), "refs/heads/edit", true);
var pr = credentials.createPullRequest(author, "master", "edit", "This is a pull request");
// Flag it as checked
var check = CheckBuilder.create("testcheck", editHash);
pr.createCheck(check.build());
check.complete(true);
pr.updateCheck(check.build());
// Now push another change
var updatedHash = CheckableRepository.appendAndCommit(localRepo, "Yet another line");
localRepo.push(updatedHash, author.url(), "edit", true);
// Attempt a merge - avoid running checks from the bot
pr.addComment("/integrate");
TestBotRunner.runPeriodicItems(mergeBot, item -> item instanceof CheckWorkItem);
// The bot should reply with an error message
var error = pr.comments().stream()
.filter(comment -> comment.body().contains("merge request cannot be fulfilled at this time"))
.filter(comment -> comment.body().contains("status check"))
.filter(comment -> comment.body().contains("has not been performed on commit"))
.count();
assertEquals(1, error);
}
}
@Test
void mergeNotification(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo);
var tempFolder = new TemporaryDirectory()) {
var author = credentials.getHostedRepository();
var integrator = credentials.getHostedRepository();
var reviewer = credentials.getHostedRepository();
var censusBuilder = credentials.getCensusBuilder()
.addAuthor(author.forge().currentUser().id())
.addReviewer(reviewer.forge().currentUser().id())
.addReviewer(integrator.forge().currentUser().id());
var mergeBot = new PullRequestBot(integrator, censusBuilder.build(), "master");
// Populate the projects repository
var localRepo = CheckableRepository.init(tempFolder.path(), author.repositoryType());
var masterHash = localRepo.resolve("master").orElseThrow();
assertFalse(CheckableRepository.hasBeenEdited(localRepo));
localRepo.push(masterHash, author.url(), "master", true);
// Make a change with a corresponding PR
var editHash = CheckableRepository.appendAndCommit(localRepo);
localRepo.push(editHash, author.url(), "refs/heads/edit", true);
var pr = credentials.createPullRequest(author, "master", "edit", "This is a pull request");
// Approve it as another user
var approvalPr = integrator.pullRequest(pr.id());
approvalPr.addReview(Review.Verdict.APPROVED, "Approved");
// Let the bot see it (a few times)
TestBotRunner.runPeriodicItems(mergeBot);
TestBotRunner.runPeriodicItems(mergeBot);
TestBotRunner.runPeriodicItems(mergeBot);
// The bot should reply with an instructional message (and only one)
var pushed = pr.comments().stream()
.filter(comment -> comment.body().contains("change now passes all automated"))
.filter(comment -> comment.body().contains("Reviewed-by: integrationreviewer3"))
.count();
assertEquals(1, pushed);
// Ensure that the bot doesn't pick up on commands in the instructional message
var error = pr.comments().stream()
.filter(comment -> comment.body().contains("Only the author"))
.count();
assertEquals(0, error);
// Drop the approval
approvalPr.addReview(Review.Verdict.DISAPPROVED, "Disapproved");
TestBotRunner.runPeriodicItems(mergeBot);
// The instructional message should have been updated
pushed = pr.comments().stream()
.filter(comment -> comment.body().contains("no longer ready for integration"))
.count();
assertEquals(1, pushed);
// Restore the approval
approvalPr.addReview(Review.Verdict.APPROVED, "Approved");
TestBotRunner.runPeriodicItems(mergeBot);
// The instructional message should have been updated
pushed = pr.comments().stream()
.filter(comment -> comment.body().contains("change now passes all automated"))
.filter(comment -> comment.body().contains("Reviewed-by: integrationreviewer3"))
.count();
assertEquals(1, pushed);
// Approve it as yet another user
var reviewerPr = reviewer.pullRequest(pr.id());
reviewerPr.addReview(Review.Verdict.APPROVED, "Approved");
TestBotRunner.runPeriodicItems(mergeBot);
// The instructional message should have been updated
pushed = pr.comments().stream()
.filter(comment -> comment.body().contains("change now passes all automated"))
.filter(comment -> comment.body().contains("Reviewed-by: integrationreviewer3, integrationreviewer2"))
.count();
assertEquals(1, pushed);
}
}
@Test
void invalidCommandAuthor(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo);
var tempFolder = new TemporaryDirectory()) {
var author = credentials.getHostedRepository();
var integrator = credentials.getHostedRepository();
var external = credentials.getHostedRepository();
var censusBuilder = credentials.getCensusBuilder()
.addAuthor(author.forge().currentUser().id());
var mergeBot = new PullRequestBot(integrator, censusBuilder.build(), "master");
// Populate the projects repository
var localRepo = CheckableRepository.init(tempFolder.path(), author.repositoryType());
var masterHash = localRepo.resolve("master").orElseThrow();
assertFalse(CheckableRepository.hasBeenEdited(localRepo));
localRepo.push(masterHash, author.url(), "master", true);
// Make a change with a corresponding PR
var editHash = CheckableRepository.appendAndCommit(localRepo);
localRepo.push(editHash, author.url(), "refs/heads/edit", true);
var pr = credentials.createPullRequest(author, "master", "edit", "This is a pull request");
// Issue a merge command not as the PR author
var externalPr = external.pullRequest(pr.id());
externalPr.addComment("/integrate");
TestBotRunner.runPeriodicItems(mergeBot);
// The bot should reply with an error message
var error = pr.comments().stream()
.filter(comment -> comment.body().contains("Only the author"))
.count();
assertEquals(1, error);
}
}
@Test
void autoRebase(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo);
var tempFolder = new TemporaryDirectory();
var pushedFolder = new TemporaryDirectory()) {
var author = credentials.getHostedRepository();
var integrator = credentials.getHostedRepository();
var censusBuilder = credentials.getCensusBuilder()
.addCommitter(author.forge().currentUser().id())
.addReviewer(integrator.forge().currentUser().id());
var mergeBot = new PullRequestBot(integrator, censusBuilder.build(), "master");
// Populate the projects repository
var localRepo = CheckableRepository.init(tempFolder.path(), author.repositoryType());
var masterHash = localRepo.resolve("master").orElseThrow();
assertFalse(CheckableRepository.hasBeenEdited(localRepo));
localRepo.push(masterHash, author.url(), "master", true);
// Make a change with a corresponding PR
var editHash = CheckableRepository.appendAndCommit(localRepo);
localRepo.push(editHash, author.url(), "edit", true);
var pr = credentials.createPullRequest(author, "master", "edit", "This is a pull request");
// Approve it as another user
var approvalPr = integrator.pullRequest(pr.id());
approvalPr.addReview(Review.Verdict.APPROVED, "Approved");
// Push something unrelated to master
localRepo.checkout(masterHash, true);
var unrelated = localRepo.root().resolve("unrelated.txt");
Files.writeString(unrelated, "Hello");
localRepo.add(unrelated);
var unrelatedHash = localRepo.commit("Unrelated", "X", "x@y.z");
localRepo.push(unrelatedHash, author.url(), "master");
// Attempt a merge (the bot should only process the first one)
pr.addComment("/integrate");
pr.addComment("/integrate");
pr.addComment("/integrate");
TestBotRunner.runPeriodicItems(mergeBot);
// The bot should reply with an ok message
var pushed = pr.comments().stream()
.filter(comment -> comment.body().contains("Pushed as commit"))
.filter(comment -> comment.body().contains("commit was automatically rebased without conflicts"))
.count();
assertEquals(1, pushed);
// The change should now be present on the master branch
var pushedRepo = Repository.materialize(pushedFolder.path(), author.url(), "master");
assertTrue(CheckableRepository.hasBeenEdited(pushedRepo));
}
}
@Test
void retryOnFailure(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo);
var tempFolder = new TemporaryDirectory();
var censusFolder = new TemporaryDirectory()) {
var author = credentials.getHostedRepository();
var integrator = credentials.getHostedRepository();
var censusBuilder = credentials.getCensusBuilder()
.addCommitter(author.forge().currentUser().id())
.addReviewer(integrator.forge().currentUser().id());
var censusRepo = censusBuilder.build();
var mergeBot = new PullRequestBot(integrator, censusRepo, "master");
// Populate the projects repository
var localRepo = CheckableRepository.init(tempFolder.path(), author.repositoryType());
var masterHash = localRepo.resolve("master").orElseThrow();
assertFalse(CheckableRepository.hasBeenEdited(localRepo));
localRepo.push(masterHash, author.url(), "master", true);
// Make a change with a corresponding PR
var editHash = CheckableRepository.appendAndCommit(localRepo);
localRepo.push(editHash, author.url(), "refs/heads/edit", true);
var pr = credentials.createPullRequest(author, "master", "edit", "This is a pull request");
// Approve it as another user
var approvalPr = integrator.pullRequest(pr.id());
approvalPr.addReview(Review.Verdict.APPROVED, "Approved");
// Let the bot check it
TestBotRunner.runPeriodicItems(mergeBot);
// Break the census to cause an exception
var localCensus = Repository.materialize(censusFolder.path(), censusRepo.url(), "+master:current_census");
var currentCensusHash = localCensus.resolve("current_census").orElseThrow();
Files.writeString(censusFolder.path().resolve("contributors.xml"), "This is not xml", StandardCharsets.UTF_8);
localCensus.add(censusFolder.path().resolve("contributors.xml"));
var badCensusHash = localCensus.commit("Bad census update", "duke", "duke@openjdk.org");
localCensus.push(badCensusHash, censusRepo.url(), "master", true);
// Attempt a merge (without triggering another check)
pr.addComment("/integrate");
assertThrows(RuntimeException.class, () -> TestBotRunner.runPeriodicItems(mergeBot, wi -> wi instanceof CheckWorkItem));
// Restore the census
localCensus.push(currentCensusHash, censusRepo.url(), "master", true);
// The bot should now retry
TestBotRunner.runPeriodicItems(mergeBot, wi -> wi instanceof CheckWorkItem);
// The bot should reply with an ok message
var pushed = pr.comments().stream()
.filter(comment -> comment.body().contains("Pushed as commit"))
.count();
assertEquals(1, pushed);
}
}
@Test
void cannotRebase(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo);
var tempFolder = new TemporaryDirectory()) {
var author = credentials.getHostedRepository();
var integrator = credentials.getHostedRepository();
var censusBuilder = credentials.getCensusBuilder()
.addCommitter(author.forge().currentUser().id())
.addReviewer(integrator.forge().currentUser().id());
var mergeBot = new PullRequestBot(integrator, censusBuilder.build(), "master");
// Populate the projects repository
var localRepo = CheckableRepository.init(tempFolder.path(), author.repositoryType());
var masterHash = localRepo.resolve("master").orElseThrow();
assertFalse(CheckableRepository.hasBeenEdited(localRepo));
localRepo.push(masterHash, author.url(), "master", true);
// Make a change with a corresponding PR
var editHash = CheckableRepository.appendAndCommit(localRepo);
localRepo.push(editHash, author.url(), "edit", true);
var pr = credentials.createPullRequest(author, "master", "edit", "This is a pull request");
// Approve it as another user
var approvalPr = integrator.pullRequest(pr.id());
approvalPr.addReview(Review.Verdict.APPROVED, "Approved");
// Push something conflicting to master
localRepo.checkout(masterHash, true);
var conflictingHash = CheckableRepository.appendAndCommit(localRepo, "This looks like a conflict");
localRepo.push(conflictingHash, author.url(), "master");
// Attempt an integration
pr.addComment("/integrate");
TestBotRunner.runPeriodicItems(mergeBot);
// The bot should reply with an error message
var error = pr.comments().stream()
.filter(comment -> comment.body().contains("It was not possible to rebase your changes automatically."))
.filter(comment -> comment.body().contains("Please merge `master`"))
.count();
assertEquals(1, error);
}
}
}