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
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
|
# Copyright 2009-2011 Canonical Ltd. This software is licensed under the
# GNU Affero General Public License version 3 (see the file LICENSE).
# pylint: disable-msg=F0401
from __future__ import with_statement
"""Unit tests for BranchMergeProposals."""
__metaclass__ = type
from datetime import (
datetime,
timedelta,
)
from difflib import unified_diff
from lazr.restful.interfaces import IJSONRequestCache
import pytz
from soupmatchers import (
HTMLContains,
Tag,
)
from testtools.matchers import (
MatchesRegex,
Not,
)
import transaction
from zope.component import getMultiAdapter
from zope.security.interfaces import Unauthorized
from zope.security.proxy import removeSecurityProxy
from canonical.launchpad.webapp import canonical_url
from canonical.launchpad.webapp.interfaces import (
BrowserNotificationLevel,
IPrimaryContext,
)
from canonical.launchpad.webapp.servers import LaunchpadTestRequest
from canonical.launchpad.webapp.testing import verifyObject
from canonical.testing.layers import (
DatabaseFunctionalLayer,
LaunchpadFunctionalLayer,
)
from lp.code.browser.branch import RegisterBranchMergeProposalView
from lp.code.browser.branchmergeproposal import (
BranchMergeProposalAddVoteView,
BranchMergeProposalChangeStatusView,
BranchMergeProposalContextMenu,
BranchMergeProposalMergedView,
BranchMergeProposalResubmitView,
BranchMergeProposalVoteView,
DecoratedCodeReviewVoteReference,
ICodeReviewNewRevisions,
latest_proposals_for_each_branch,
)
from lp.code.browser.codereviewcomment import CodeReviewDisplayComment
from lp.code.enums import (
BranchMergeProposalStatus,
CodeReviewVote,
)
from lp.code.model.diff import PreviewDiff
from lp.code.tests.helpers import (
add_revision_to_branch,
make_merge_proposal_without_reviewers,
)
from lp.services.messages.model.message import MessageSet
from lp.testing import (
BrowserTestCase,
feature_flags,
login_person,
person_logged_in,
set_feature_flag,
TestCaseWithFactory,
time_counter,
)
from lp.testing.views import create_initialized_view
class TestBranchMergeProposalPrimaryContext(TestCaseWithFactory):
"""Tests the adaptation of a merge proposal into a primary context."""
layer = DatabaseFunctionalLayer
def testPrimaryContext(self):
# The primary context of a merge proposal is the same as the primary
# context of the source_branch.
bmp = self.factory.makeBranchMergeProposal()
self.assertEqual(
IPrimaryContext(bmp).context,
IPrimaryContext(bmp.source_branch).context)
class TestBranchMergeProposalContextMenu(TestCaseWithFactory):
layer = DatabaseFunctionalLayer
def test_add_comment_enabled_when_not_mergeable(self):
"""It should be possible to comment on an unmergeable proposal."""
bmp = self.factory.makeBranchMergeProposal(
set_state=BranchMergeProposalStatus.REJECTED)
login_person(bmp.registrant)
menu = BranchMergeProposalContextMenu(bmp)
self.assertTrue(menu.add_comment().enabled)
class TestDecoratedCodeReviewVoteReference(TestCaseWithFactory):
layer = DatabaseFunctionalLayer
def test_commentEnabled(self):
"""It should be possible to review an unmergeable proposal."""
request = self.factory.makeCodeReviewVoteReference()
bmp = request.branch_merge_proposal
bmp.rejectBranch(bmp.target_branch.owner, 'foo')
d = DecoratedCodeReviewVoteReference(request, request.reviewer, None)
self.assertTrue(d.user_can_review)
self.assertTrue(d.can_change_review)
class TestBranchMergeProposalMergedView(TestCaseWithFactory):
"""Tests for `BranchMergeProposalMergedView`."""
layer = DatabaseFunctionalLayer
def setUp(self):
# Use an admin so we don't have to worry about launchpad.Edit
# permissions on the merge proposals for adding comments, or
# nominating reviewers.
TestCaseWithFactory.setUp(self, user="admin@canonical.com")
self.bmp = self.factory.makeBranchMergeProposal()
def test_initial_values(self):
# The default merged_revno is the head revno of the target branch.
view = BranchMergeProposalMergedView(self.bmp, LaunchpadTestRequest())
self.bmp.source_branch.revision_count = 1
self.bmp.target_branch.revision_count = 2
self.assertEqual(
{'merged_revno': self.bmp.target_branch.revision_count},
view.initial_values)
class TestBranchMergeProposalAddVoteView(TestCaseWithFactory):
"""Test the AddVote view."""
layer = DatabaseFunctionalLayer
def setUp(self):
TestCaseWithFactory.setUp(self)
self.bmp = self.factory.makeBranchMergeProposal()
def _createView(self):
# Construct the view and initialize it.
view = BranchMergeProposalAddVoteView(
self.bmp, LaunchpadTestRequest())
view.initialize()
return view
def test_init_with_random_person(self):
"""Any random person ought to be able to vote."""
login_person(self.factory.makePerson())
self._createView()
def test_init_with_anonymous(self):
"""Anonymous people cannot vote."""
self.assertRaises(AssertionError, self._createView)
class TestBranchMergeProposalVoteView(TestCaseWithFactory):
"""Make sure that the votes are returned in the right order."""
layer = DatabaseFunctionalLayer
def setUp(self):
# Use an admin so we don't have to worry about launchpad.Edit
# permissions on the merge proposals for adding comments, or
# nominating reviewers.
TestCaseWithFactory.setUp(self, user="admin@canonical.com")
self.bmp = make_merge_proposal_without_reviewers(self.factory)
self.date_generator = time_counter(delta=timedelta(days=1))
def _createComment(self, reviewer, vote):
"""Create a comment on the merge proposal."""
self.bmp.createComment(
owner=reviewer,
subject=self.factory.getUniqueString('subject'),
vote=vote,
_date_created=self.date_generator.next())
def _nominateReviewer(self, reviewer, registrant):
"""Nominate a reviewer for the merge proposal."""
self.bmp.nominateReviewer(
reviewer=reviewer, registrant=registrant,
_date_created=self.date_generator.next())
def testNoVotes(self):
# No votes should return empty lists
login_person(self.factory.makePerson())
view = BranchMergeProposalVoteView(self.bmp, LaunchpadTestRequest())
self.assertEqual([], view.current_reviews)
self.assertEqual([], view.requested_reviews)
# The vote table should not be shown, because there are no votes, and
# the logged-in user cannot request reviews.
self.assertFalse(view.show_table)
def testRequestedOrdering(self):
# No votes should return empty lists
# Request three reviews.
albert = self.factory.makePerson(name='albert')
bob = self.factory.makePerson(name='bob')
charles = self.factory.makePerson(name='charles')
owner = self.bmp.source_branch.owner
self._nominateReviewer(albert, owner)
self._nominateReviewer(bob, owner)
self._nominateReviewer(charles, owner)
view = BranchMergeProposalVoteView(self.bmp, LaunchpadTestRequest())
self.assertEqual([], view.current_reviews)
requested_reviews = view.requested_reviews
self.assertEqual(3, len(requested_reviews))
self.assertEqual(
[charles, bob, albert],
[review.reviewer for review in requested_reviews])
def test_user_can_claim_self(self):
"""Someone cannot claim a review already assigned to them."""
albert = self.factory.makePerson()
owner = self.bmp.source_branch.owner
self._nominateReviewer(albert, owner)
login_person(albert)
view = BranchMergeProposalVoteView(self.bmp, LaunchpadTestRequest())
self.assertFalse(view.requested_reviews[0].user_can_claim)
def test_user_can_claim_member(self):
"""Someone can claim a review already assigned to their team."""
albert = self.factory.makePerson()
review_team = self.factory.makeTeam()
albert.join(review_team)
owner = self.bmp.source_branch.owner
self._nominateReviewer(review_team, owner)
login_person(albert)
view = BranchMergeProposalVoteView(self.bmp, LaunchpadTestRequest())
self.assertTrue(view.requested_reviews[0].user_can_claim)
def test_user_can_claim_nonmember(self):
"""A non-member cannot claim a team's review."""
albert = self.factory.makePerson()
review_team = self.factory.makeTeam()
owner = self.bmp.source_branch.owner
self._nominateReviewer(review_team, owner)
login_person(albert)
view = BranchMergeProposalVoteView(self.bmp, LaunchpadTestRequest())
self.assertFalse(view.requested_reviews[0].user_can_claim)
def makeReviewRequest(self, viewer=None, registrant=None):
albert = self.factory.makePerson()
if registrant is None:
registrant = self.bmp.source_branch.owner
self._nominateReviewer(albert, registrant)
if viewer is None:
viewer = albert
login_person(viewer)
view = BranchMergeProposalVoteView(self.bmp, LaunchpadTestRequest())
return view.requested_reviews[0]
def test_user_can_reassign_assignee(self):
"""The user can reassign if they are the assignee."""
review_request = self.makeReviewRequest()
self.assertTrue(review_request.user_can_reassign)
def test_user_can_reassign_registrant(self):
"""The user can reassign if they are the registrant."""
registrant = self.factory.makePerson()
review_request = self.makeReviewRequest(registrant, registrant)
self.assertTrue(review_request.user_can_reassign)
def test_user_cannot_reassign_random_person(self):
"""Random people cannot reassign reviews."""
viewer = self.factory.makePerson()
review_request = self.makeReviewRequest(viewer)
self.assertFalse(review_request.user_can_reassign)
def testCurrentReviewOrdering(self):
# Most recent first.
# Request three reviews.
albert = self.factory.makePerson(name='albert')
bob = self.factory.makePerson(name='bob')
charles = self.factory.makePerson(name='charles')
self._createComment(albert, CodeReviewVote.APPROVE)
self._createComment(bob, CodeReviewVote.ABSTAIN)
self._createComment(charles, CodeReviewVote.DISAPPROVE)
view = BranchMergeProposalVoteView(self.bmp, LaunchpadTestRequest())
self.assertEqual(
[charles, bob, albert],
[review.reviewer for review in view.current_reviews])
def testChangeOfVoteBringsToTop(self):
# Changing the vote changes the vote date, so it comes to the top.
# Request three reviews.
albert = self.factory.makePerson(name='albert')
bob = self.factory.makePerson(name='bob')
self._createComment(albert, CodeReviewVote.ABSTAIN)
self._createComment(bob, CodeReviewVote.APPROVE)
self._createComment(albert, CodeReviewVote.APPROVE)
view = BranchMergeProposalVoteView(self.bmp, LaunchpadTestRequest())
self.assertEqual(
[albert, bob],
[review.reviewer for review in view.current_reviews])
def addReviewTeam(self):
review_team = self.factory.makeTeam(name='reviewteam')
self.bmp.target_branch.reviewer = review_team
def test_review_team_members_trusted(self):
"""Members of the target branch's review team are trusted."""
self.addReviewTeam()
albert = self.factory.makePerson(name='albert')
albert.join(self.bmp.target_branch.reviewer)
self._createComment(albert, CodeReviewVote.APPROVE)
view = BranchMergeProposalVoteView(self.bmp, LaunchpadTestRequest())
self.assertTrue(view.reviews[0].trusted)
def test_review_team_nonmembers_untrusted(self):
"""Non-members of the target branch's review team are untrusted."""
self.addReviewTeam()
albert = self.factory.makePerson(name='albert')
self._createComment(albert, CodeReviewVote.APPROVE)
view = BranchMergeProposalVoteView(self.bmp, LaunchpadTestRequest())
self.assertFalse(view.reviews[0].trusted)
def test_no_review_team_untrusted(self):
"""If the target branch has no review team, everyone is untrusted."""
albert = self.factory.makePerson(name='albert')
self._createComment(albert, CodeReviewVote.APPROVE)
view = BranchMergeProposalVoteView(self.bmp, LaunchpadTestRequest())
self.assertFalse(view.reviews[0].trusted)
def test_render_all_vote_types(self):
# A smoke test that the view knows how to render all types of vote.
for vote in CodeReviewVote.items:
self._createComment(
self.factory.makePerson(), vote)
view = getMultiAdapter(
(self.bmp, LaunchpadTestRequest()), name='+votes')
self.failUnless(
isinstance(view, BranchMergeProposalVoteView),
"The +votes page for a BranchMergeProposal is expected to be a "
"BranchMergeProposalVoteView")
# We just test that rendering does not raise.
view.render()
class TestRegisterBranchMergeProposalView(BrowserTestCase):
"""Test the merge proposal registration view."""
layer = LaunchpadFunctionalLayer
def setUp(self):
TestCaseWithFactory.setUp(self)
self.source_branch = self.factory.makeProductBranch()
self.user = self.factory.makePerson()
login_person(self.user)
def _makeTargetBranch(self):
return self.factory.makeProductBranch(
product=self.source_branch.product)
def _makeTargetBranchWithReviewer(self):
albert = self.factory.makePerson(name='albert')
target_branch = self.factory.makeProductBranch(
reviewer=albert, product=self.source_branch.product)
return target_branch, albert
def _createView(self):
# Construct the view and initialize it.
view = RegisterBranchMergeProposalView(
self.source_branch, LaunchpadTestRequest())
view.initialize()
return view
def _getSourceProposal(self, target_branch):
# There will only be one proposal.
landing_targets = list(self.source_branch.landing_targets)
self.assertEqual(1, len(landing_targets))
proposal = landing_targets[0]
self.assertEqual(target_branch, proposal.target_branch)
return proposal
def assertOnePendingReview(self, proposal, reviewer, review_type=None):
# There should be one pending vote for the reviewer with the specified
# review type.
votes = list(proposal.votes)
self.assertEqual(1, len(votes))
self.assertEqual(reviewer, votes[0].reviewer)
self.assertEqual(self.user, votes[0].registrant)
self.assertIs(None, votes[0].comment)
if review_type is None:
self.assertIs(None, votes[0].review_type)
else:
self.assertEqual(review_type, votes[0].review_type)
def test_register_simplest_case(self):
# This simplest case is where the user only specifies the target
# branch, and not an initial comment or reviewer. The reviewer will
# therefore be set to the branch owner.
target_branch = self._makeTargetBranch()
view = self._createView()
view.register_action.success(
{'target_branch': target_branch,
'needs_review': True})
proposal = self._getSourceProposal(target_branch)
self.assertOnePendingReview(proposal, target_branch.owner)
self.assertIs(None, proposal.description)
def test_register_work_in_progress(self):
# The needs review checkbox can be unchecked to create a work in
# progress proposal.
target_branch = self._makeTargetBranch()
view = self._createView()
view.register_action.success(
{'target_branch': target_branch,
'needs_review': False})
proposal = self._getSourceProposal(target_branch)
self.assertEqual(
BranchMergeProposalStatus.WORK_IN_PROGRESS,
proposal.queue_status)
def test_register_with_commit_message(self):
# A commit message can also be set during the register process.
target_branch = self._makeTargetBranch()
view = self._createView()
view.register_action.success(
{'target_branch': target_branch,
'needs_review': True,
'commit_message': 'Fixed the bug!'})
proposal = self._getSourceProposal(target_branch)
self.assertEqual('Fixed the bug!', proposal.commit_message)
def test_register_initial_comment(self):
# If the user specifies a description, this is recorded on the
# proposal.
target_branch = self._makeTargetBranch()
view = self._createView()
view.register_action.success(
{'target_branch': target_branch,
'comment': "This is the description.",
'needs_review': True})
proposal = self._getSourceProposal(target_branch)
self.assertOnePendingReview(proposal, target_branch.owner)
self.assertEqual(proposal.description, "This is the description.")
def test_register_request_reviewer(self):
# If the user requests a reviewer, then a pending vote is added to the
# proposal.
target_branch = self._makeTargetBranch()
reviewer = self.factory.makePerson()
view = self._createView()
view.register_action.success(
{'target_branch': target_branch,
'reviewer': reviewer,
'needs_review': True})
proposal = self._getSourceProposal(target_branch)
self.assertOnePendingReview(proposal, reviewer)
self.assertIs(None, proposal.description)
def test_register_request_review_type(self):
# We can request a specific review type of the reviewer. If we do, it
# is recorded along with the pending review.
target_branch = self._makeTargetBranch()
reviewer = self.factory.makePerson()
view = self._createView()
view.register_action.success(
{'target_branch': target_branch,
'reviewer': reviewer,
'review_type': 'god-like',
'needs_review': True})
proposal = self._getSourceProposal(target_branch)
self.assertOnePendingReview(proposal, reviewer, 'god-like')
self.assertIs(None, proposal.description)
def test_register_comment_and_review(self):
# The user can give a description and request a review from
# someone.
target_branch = self._makeTargetBranch()
reviewer = self.factory.makePerson()
view = self._createView()
view.register_action.success(
{'target_branch': target_branch,
'reviewer': reviewer,
'review_type': 'god-like',
'comment': "This is the description.",
'needs_review': True})
proposal = self._getSourceProposal(target_branch)
self.assertOnePendingReview(proposal, reviewer, 'god-like')
self.assertEqual(proposal.description, "This is the description.")
def test_register_for_target_with_default_reviewer(self):
# A simple case is where the user only specifies the target
# branch, and not an initial comment or reviewer. The target branch
# has a reviewer so that reviewer should be used
target_branch, reviewer = self._makeTargetBranchWithReviewer()
view = self._createView()
view.register_action.success(
{'target_branch': target_branch,
'needs_review': True})
proposal = self._getSourceProposal(target_branch)
self.assertOnePendingReview(proposal, reviewer)
self.assertIs(None, proposal.description)
def test_register_request_review_type_branch_reviewer(self):
# We can ask for a specific review type. The target branch has a
# reviewer so that reviewer should be used.
target_branch, reviewer = self._makeTargetBranchWithReviewer()
view = self._createView()
view.register_action.success(
{'target_branch': target_branch,
'review_type': 'god-like',
'needs_review': True})
proposal = self._getSourceProposal(target_branch)
self.assertOnePendingReview(proposal, reviewer, 'god-like')
self.assertIs(None, proposal.description)
def test_register_reviewer_not_hidden(self):
branch = self.factory.makeBranch()
browser = self.getViewBrowser(branch, '+register-merge')
extra = Tag(
'extra', 'fieldset', attrs={'id': 'mergeproposal-extra-options'})
reviewer = Tag('reviewer', 'input', attrs={'id': 'field.reviewer'})
matcher = Not(HTMLContains(reviewer.within(extra)))
self.assertThat(browser.contents, matcher)
class TestBranchMergeProposalResubmitView(TestCaseWithFactory):
"""Test BranchMergeProposalResubmitView."""
layer = DatabaseFunctionalLayer
def createView(self):
"""Create the required view."""
context = self.factory.makeBranchMergeProposal()
self.useContext(person_logged_in(context.registrant))
view = BranchMergeProposalResubmitView(
context, LaunchpadTestRequest())
view.initialize()
return view
def test_resubmit_action(self):
"""resubmit_action resubmits the proposal."""
view = self.createView()
context = view.context
new_proposal = view.resubmit_action.success(
{'source_branch': context.source_branch,
'target_branch': context.target_branch,
'prerequisite_branch': context.prerequisite_branch,
'description': None,
'break_link': False,
})
self.assertEqual(new_proposal.supersedes, context)
self.assertEqual(new_proposal.source_branch, context.source_branch)
self.assertEqual(new_proposal.target_branch, context.target_branch)
self.assertEqual(
new_proposal.prerequisite_branch, context.prerequisite_branch)
def test_resubmit_action_change_branches(self):
"""Changing the branches changes the branches in the new proposal."""
view = self.createView()
target = view.context.source_branch.target
new_source = self.factory.makeBranchTargetBranch(target)
new_target = self.factory.makeBranchTargetBranch(target)
new_prerequisite = self.factory.makeBranchTargetBranch(target)
new_proposal = view.resubmit_action.success(
{'source_branch': new_source, 'target_branch': new_target,
'prerequisite_branch': new_prerequisite,
'description': 'description',
'break_link': False,
})
self.assertEqual(new_proposal.supersedes, view.context)
self.assertEqual(new_proposal.source_branch, new_source)
self.assertEqual(new_proposal.target_branch, new_target)
self.assertEqual(new_proposal.prerequisite_branch, new_prerequisite)
def test_resubmit_action_break_link(self):
"""Enabling break_link prevents linking the old and new proposals."""
view = self.createView()
new_proposal = self.resubmitDefault(view, break_link=True)
self.assertIs(None, new_proposal.supersedes)
@staticmethod
def resubmitDefault(view, break_link=False, prerequisite_branch=None):
context = view.context
if prerequisite_branch is None:
prerequisite_branch = context.prerequisite_branch
return view.resubmit_action.success(
{'source_branch': context.source_branch,
'target_branch': context.target_branch,
'prerequisite_branch': prerequisite_branch,
'description': None,
'break_link': break_link,
})
def test_resubmit_existing(self):
"""Resubmitting a proposal when another is active is a user error."""
view = self.createView()
first_bmp = view.context
with person_logged_in(first_bmp.target_branch.owner):
first_bmp.resubmit(first_bmp.registrant)
self.resubmitDefault(view)
(notification,) = view.request.response.notifications
self.assertThat(
notification.message, MatchesRegex('Cannot resubmit because'
' <a href=.*>a similar merge proposal</a> is already active.'))
self.assertEqual(BrowserNotificationLevel.ERROR, notification.level)
def test_resubmit_same_target_prerequisite(self):
"""User error if same branch is target and prerequisite."""
view = self.createView()
first_bmp = view.context
self.resubmitDefault(
view, prerequisite_branch=first_bmp.target_branch)
self.assertEqual(
view.errors,
['Target and prerequisite branches must be different.'])
class TestResubmitBrowser(BrowserTestCase):
"""Browser tests for resubmitting branch merge proposals."""
layer = DatabaseFunctionalLayer
def test_resubmit_text(self):
"""The text of the resubmit page is as expected."""
bmp = self.factory.makeBranchMergeProposal(registrant=self.user)
text = self.getMainText(bmp, '+resubmit')
expected = (
'Resubmit proposal to merge.*'
'Source Branch:.*'
'Target Branch:.*'
'Prerequisite Branch:.*'
'Description.*'
'Start afresh.*')
self.assertTextMatchesExpressionIgnoreWhitespace(expected, text)
def test_resubmit_controls(self):
"""Proposals can be resubmitted using the browser."""
bmp = self.factory.makeBranchMergeProposal(registrant=self.user)
browser = self.getViewBrowser(bmp, '+resubmit')
browser.getControl('Description').value = 'flibble'
browser.getControl('Resubmit').click()
self.assertEqual('flibble', bmp.superseded_by.description)
class TestBranchMergeProposalView(TestCaseWithFactory):
layer = LaunchpadFunctionalLayer
def setUp(self):
TestCaseWithFactory.setUp(self)
self.user = self.factory.makePerson()
self.bmp = self.factory.makeBranchMergeProposal(registrant=self.user)
login_person(self.user)
def makeTeamReview(self):
owner = self.bmp.source_branch.owner
review_team = self.factory.makeTeam()
return self.bmp.nominateReviewer(review_team, owner)
def test_claim_action_team_member(self):
"""Claiming a review works for members of the requested team."""
review = self.makeTeamReview()
albert = self.factory.makePerson()
removeSecurityProxy(albert).join(review.reviewer)
login_person(albert)
view = create_initialized_view(self.bmp, '+index')
view.claim_action.success({'review_id': review.id})
self.assertEqual(albert, review.reviewer)
def test_claim_action_non_member(self):
"""Claiming a review does not work for non-members."""
review = self.makeTeamReview()
albert = self.factory.makePerson()
login_person(albert)
view = create_initialized_view(self.bmp, '+index')
self.assertRaises(Unauthorized, view.claim_action.success,
{'review_id': review.id})
def test_claim_no_oops(self):
""""An invalid attempt to claim a review should not oops."""
review = self.factory.makeCodeReviewVoteReference()
view = create_initialized_view(review.branch_merge_proposal, '+index')
view.claim_action.success({'review_id': review.id})
self.assertEqual(
['Cannot claim non-team reviews.'],
[n.message for n in view.request.response.notifications])
def test_preview_diff_text_with_no_diff(self):
"""preview_diff_text should be None if context has no preview_diff."""
view = create_initialized_view(self.bmp, '+index')
self.assertIs(None, view.preview_diff_text)
def test_preview_diff_utf8(self):
"""A preview_diff in utf-8 should decoded as utf-8."""
text = ''.join(unichr(x) for x in range(255))
diff_bytes = ''.join(unified_diff('', text)).encode('utf-8')
self.setPreviewDiff(diff_bytes)
transaction.commit()
view = create_initialized_view(self.bmp, '+index')
self.assertEqual(diff_bytes.decode('utf-8'),
view.preview_diff_text)
def test_preview_diff_all_chars(self):
"""preview_diff should work on diffs containing all possible bytes."""
text = ''.join(chr(x) for x in range(255))
diff_bytes = ''.join(unified_diff('', text))
self.setPreviewDiff(diff_bytes)
transaction.commit()
view = create_initialized_view(self.bmp, '+index')
self.assertEqual(diff_bytes.decode('windows-1252', 'replace'),
view.preview_diff_text)
def setPreviewDiff(self, preview_diff_bytes):
preview_diff = PreviewDiff.create(
preview_diff_bytes, u'a', u'b', None, u'')
removeSecurityProxy(self.bmp).preview_diff = preview_diff
return preview_diff
def test_linked_bugs_excludes_mutual_bugs(self):
"""List bugs that are linked to the source only."""
bug = self.factory.makeBug()
self.bmp.source_branch.linkBug(bug, self.bmp.registrant)
self.bmp.target_branch.linkBug(bug, self.bmp.registrant)
view = create_initialized_view(self.bmp, '+index')
self.assertEqual([], view.linked_bugtasks)
def test_linked_bugs_excludes_private_bugs(self):
"""List bugs that are linked to the source only."""
bug = self.factory.makeBug()
person = self.factory.makePerson()
private_bug = self.factory.makeBug(owner=person, private=True)
self.bmp.source_branch.linkBug(bug, self.bmp.registrant)
with person_logged_in(person):
self.bmp.source_branch.linkBug(private_bug, self.bmp.registrant)
view = create_initialized_view(self.bmp, '+index')
self.assertEqual([bug.default_bugtask], view.linked_bugtasks)
def makeRevisionGroups(self):
review_date = datetime(2009, 9, 10, tzinfo=pytz.UTC)
bmp = self.factory.makeBranchMergeProposal(
date_created=review_date)
first_commit = datetime(2009, 9, 9, tzinfo=pytz.UTC)
add_revision_to_branch(
self.factory, bmp.source_branch, first_commit)
login_person(bmp.registrant)
bmp.requestReview(review_date)
revision_date = review_date + timedelta(days=1)
revisions = []
for date in range(2):
revisions.append(
add_revision_to_branch(
self.factory, bmp.source_branch, revision_date))
revisions.append(
add_revision_to_branch(
self.factory, bmp.source_branch, revision_date))
revision_date += timedelta(days=1)
return bmp, revisions
def test_getRevisionsIncludesIncrementalDiffs(self):
bmp, revisions = self.makeRevisionGroups()
diff = self.factory.makeIncrementalDiff(merge_proposal=bmp,
old_revision=revisions[1].revision.getLefthandParent(),
new_revision=revisions[3].revision)
self.useContext(feature_flags())
set_feature_flag(u'code.incremental_diffs.enabled', u'enabled')
view = create_initialized_view(bmp, '+index')
comments = view.conversation.comments
self.assertEqual(
[diff],
[comment.diff for comment in comments])
def test_CodeReviewNewRevisions_implements_ICodeReviewNewRevisions(self):
# The browser helper class implements its interface.
review_date = datetime(2009, 9, 10, tzinfo=pytz.UTC)
revision_date = review_date + timedelta(days=1)
bmp = self.factory.makeBranchMergeProposal(
date_created=review_date)
add_revision_to_branch(self.factory, bmp.source_branch, revision_date)
view = create_initialized_view(bmp, '+index')
new_revisions = view.conversation.comments[0]
self.assertTrue(verifyObject(ICodeReviewNewRevisions, new_revisions))
def test_include_superseded_comments(self):
for x, time in zip(range(3), time_counter()):
if x != 0:
self.bmp = self.bmp.resubmit(self.user)
self.bmp.createComment(
self.user, 'comment %d' % x, _date_created=time)
view = create_initialized_view(self.bmp, '+index')
self.assertEqual(
['comment 0', 'comment 1', 'comment 2'],
[comment.comment.message.subject for comment
in view.conversation.comments])
self.assertFalse(view.conversation.comments[2].from_superseded)
self.assertTrue(view.conversation.comments[1].from_superseded)
self.assertTrue(view.conversation.comments[0].from_superseded)
def test_pending_diff_with_pending_branch(self):
bmp = self.factory.makeBranchMergeProposal()
bmp.next_preview_diff_job.start()
bmp.next_preview_diff_job.fail()
view = create_initialized_view(bmp, '+index')
self.assertFalse(view.pending_diff)
with person_logged_in(bmp.source_branch.owner):
bmp.source_branch.branchChanged(None, 'rev-1', None, None, None)
self.assertTrue(view.pending_diff)
def test_subscribe_to_merge_proposal_events_flag_disabled(self):
# If the longpoll.merge_proposals.enabled flag is not enabled the user
# is *not* subscribed to events relating to the merge proposal.
bmp = self.factory.makeBranchMergeProposal()
view = create_initialized_view(bmp, '+index', current_request=True)
cache = IJSONRequestCache(view.request)
self.assertNotIn("longpoll", cache.objects)
self.assertNotIn("merge_proposal_event_key", cache.objects)
def test_subscribe_to_merge_proposal_events_flag_enabled(self):
# If the longpoll.merge_proposals.enabled flag is enabled the user is
# subscribed to events relating to the merge proposal.
bmp = self.factory.makeBranchMergeProposal()
self.useContext(feature_flags())
set_feature_flag(u'longpoll.merge_proposals.enabled', u'enabled')
view = create_initialized_view(bmp, '+index', current_request=True)
cache = IJSONRequestCache(view.request)
self.assertIn("longpoll", cache.objects)
self.assertIn("merge_proposal_event_key", cache.objects)
def test_description_is_meta_description(self):
description = (
"I'd like to make the bmp description appear as the meta "
"description: this does that "
+ "abcdef " * 300)
bmp = self.factory.makeBranchMergeProposal(
description=description)
browser = self.getUserBrowser(
canonical_url(bmp, rootsite='code'))
expected_meta = Tag(
'meta description',
'meta', attrs=dict(
name='description',
content=description[:497] + '...'))
self.assertThat(browser.contents, HTMLContains(expected_meta))
class TestBranchMergeProposalChangeStatusOptions(TestCaseWithFactory):
"""Test the status vocabulary generated for then +edit-status view."""
layer = DatabaseFunctionalLayer
def setUp(self):
TestCaseWithFactory.setUp(self)
self.user = self.factory.makePerson()
login_person(self.user)
self.proposal = self.factory.makeBranchMergeProposal(
registrant=self.user)
def _createView(self):
# Construct the view and initialize it.
view = BranchMergeProposalChangeStatusView(
self.proposal, LaunchpadTestRequest())
view.initialize()
return view
def assertStatusVocabTokens(self, tokens, user):
# Assert that the tokens specified are the only tokens in the
# generated vocabulary.
login_person(user)
vocabulary = self._createView()._createStatusVocabulary()
vocab_tokens = sorted([term.token for term in vocabulary])
self.assertEqual(
sorted(tokens), vocab_tokens)
def assertAllStatusesAvailable(self, user, except_for=None):
# All options should be available to the user, except for SUPERSEDED,
# which is only provided through resubmit.
desired_statuses = set([
'WORK_IN_PROGRESS', 'NEEDS_REVIEW', 'MERGED', 'CODE_APPROVED',
'REJECTED'])
if except_for is not None:
desired_statuses -= set(except_for)
self.assertStatusVocabTokens(desired_statuses, user)
def test_createStatusVocabulary_non_reviewer(self):
# Neither the source branch owner nor the registrant should be
# able to approve or reject their own code (assuming they don't have
# rights on the target branch).
status_options = [
'WORK_IN_PROGRESS', 'NEEDS_REVIEW', 'MERGED']
self.assertStatusVocabTokens(
status_options, user=self.proposal.source_branch.owner)
self.assertStatusVocabTokens(
status_options, user=self.proposal.registrant)
def test_createStatusVocabulary_reviewer(self):
# The registrant should not be able to approve or reject
# their own code (assuming they don't have rights on the target
# branch).
self.assertAllStatusesAvailable(self.proposal.target_branch.owner)
def test_createStatusVocabulary_non_reviewer_approved(self):
# Once the branch has been approved, the source owner or the
# registrant can queue the branch.
self.proposal.approveBranch(
self.proposal.target_branch.owner, 'some-revision')
status_options = [
'WORK_IN_PROGRESS', 'NEEDS_REVIEW', 'CODE_APPROVED', 'MERGED']
self.assertStatusVocabTokens(
status_options, user=self.proposal.source_branch.owner)
self.assertStatusVocabTokens(
status_options, user=self.proposal.registrant)
def test_createStatusVocabulary_reviewer_approved(self):
# The target branch owner's options are not changed by whether or not
# the proposal is currently approved.
self.proposal.approveBranch(
self.proposal.target_branch.owner, 'some-revision')
self.assertAllStatusesAvailable(
user=self.proposal.target_branch.owner)
def test_createStatusVocabulary_rejected(self):
# Only reviewers can change rejected proposals to approved. All other
# options for rejected proposals are the same regardless of user.
self.proposal.rejectBranch(
self.proposal.target_branch.owner, 'some-revision')
self.assertAllStatusesAvailable(
user=self.proposal.source_branch.owner,
except_for=['CODE_APPROVED', 'QUEUED'])
self.assertAllStatusesAvailable(user=self.proposal.registrant,
except_for=['CODE_APPROVED', 'QUEUED'])
self.assertAllStatusesAvailable(
user=self.proposal.target_branch.owner)
def test_createStatusVocabulary_queued(self):
# Queued proposals can go to any status, but only reviewers can set
# them to REJECTED.
self.proposal.enqueue(
self.proposal.target_branch.owner, 'some-revision')
self.assertAllStatusesAvailable(
user=self.proposal.source_branch.owner, except_for=['REJECTED'])
self.assertAllStatusesAvailable(user=self.proposal.registrant,
except_for=['REJECTED'])
self.assertAllStatusesAvailable(
user=self.proposal.target_branch.owner)
class TestCommentAttachmentRendering(TestCaseWithFactory):
"""Test diff attachments are rendered correctly."""
layer = LaunchpadFunctionalLayer
def _makeCommentFromEmailWithAttachment(self, attachment_body):
# Make an email message with an attachment, and create a code
# review comment from it.
bmp = self.factory.makeBranchMergeProposal()
login_person(bmp.registrant)
msg = self.factory.makeEmailMessage(
body='testing',
attachments=[('test.diff', 'text/plain', attachment_body)])
message = MessageSet().fromEmail(msg.as_string())
return CodeReviewDisplayComment(
bmp.createCommentFromMessage(message, None, None, msg))
def test_nonascii_in_attachment_renders(self):
# The view should render without errors.
comment = self._makeCommentFromEmailWithAttachment('\xe2\x98\x95')
# Need to commit in order to read the diff out of the librarian.
transaction.commit()
view = create_initialized_view(comment, '+comment-body')
view()
def test_nonascii_in_attachment_decoded(self):
# The diff_text should be a unicode string.
comment = self._makeCommentFromEmailWithAttachment('\xe2\x98\x95')
# Need to commit in order to read the diff out of the librarian.
transaction.commit()
view = create_initialized_view(comment, '+comment-body')
[diff_attachment] = view.comment.display_attachments
self.assertEqual(u'\u2615', diff_attachment.diff_text)
class TestBranchMergeCandidateView(TestCaseWithFactory):
"""Test the status title for the view."""
layer = DatabaseFunctionalLayer
def test_needs_review_title(self):
# No title is set for a proposal needing review.
bmp = self.factory.makeBranchMergeProposal(
set_state=BranchMergeProposalStatus.NEEDS_REVIEW)
view = create_initialized_view(bmp, '+link-summary')
self.assertEqual('', view.status_title)
def test_approved_shows_reviewer(self):
# If the proposal is approved, the approver is shown in the title
# along with when they approved it.
bmp = self.factory.makeBranchMergeProposal()
owner = bmp.target_branch.owner
login_person(bmp.target_branch.owner)
owner.displayname = 'Eric'
bmp.approveBranch(owner, 'some-rev', datetime(
year=2008, month=9, day=10, tzinfo=pytz.UTC))
view = create_initialized_view(bmp, '+link-summary')
self.assertEqual('Eric on 2008-09-10', view.status_title)
def test_rejected_shows_reviewer(self):
# If the proposal is rejected, the approver is shown in the title
# along with when they approved it.
bmp = self.factory.makeBranchMergeProposal()
owner = bmp.target_branch.owner
login_person(bmp.target_branch.owner)
owner.displayname = 'Eric'
bmp.rejectBranch(owner, 'some-rev', datetime(
year=2008, month=9, day=10, tzinfo=pytz.UTC))
view = create_initialized_view(bmp, '+link-summary')
self.assertEqual('Eric on 2008-09-10', view.status_title)
class TestBranchMergeProposal(BrowserTestCase):
layer = LaunchpadFunctionalLayer
def test_conversation(self):
source_branch = self.factory.makeBranch()
parent = add_revision_to_branch(self.factory, source_branch,
self.factory.getUniqueDate()).revision
bmp = self.factory.makeBranchMergeProposal(registrant=self.user,
date_created=self.factory.getUniqueDate(),
source_branch=source_branch)
revision = add_revision_to_branch(self.factory, bmp.source_branch,
self.factory.getUniqueDate()).revision
diff = self.factory.makeDiff()
bmp.generateIncrementalDiff(parent, revision, diff)
self.useContext(feature_flags())
set_feature_flag(u'code.incremental_diffs.enabled', u'enabled')
browser = self.getViewBrowser(bmp)
assert 'unf_pbasyvpgf' in browser.contents
def test_pending_diff_message_with_longpoll_enabled(self):
# If the longpoll feature flag is enabled then the message
# displayed for a pending diff indicates that it'll update
# automatically. See also
# lib/lp/code/stories/branches/xx-branchmergeproposals.txt
self.useContext(feature_flags())
set_feature_flag(u'longpoll.merge_proposals.enabled', u'enabled')
bmp = self.factory.makeBranchMergeProposal()
browser = self.getViewBrowser(bmp)
self.assertIn(
"An updated diff is being calculated and will appear "
"automatically when ready.",
browser.contents)
class TestLatestProposalsForEachBranch(TestCaseWithFactory):
"""Confirm that the latest branch is returned."""
layer = DatabaseFunctionalLayer
def test_newest_first(self):
# If each proposal targets a different branch, each will be returned.
bmp1 = self.factory.makeBranchMergeProposal(
date_created=(
datetime(year=2008, month=9, day=10, tzinfo=pytz.UTC)))
bmp2 = self.factory.makeBranchMergeProposal(
date_created=(
datetime(year=2008, month=10, day=10, tzinfo=pytz.UTC)))
self.assertEqual(
[bmp2, bmp1], latest_proposals_for_each_branch([bmp1, bmp2]))
def test_visible_filtered_out(self):
# If the proposal is not visible to the user, they are not returned.
bmp1 = self.factory.makeBranchMergeProposal(
date_created=(
datetime(year=2008, month=9, day=10, tzinfo=pytz.UTC)))
bmp2 = self.factory.makeBranchMergeProposal(
date_created=(
datetime(year=2008, month=10, day=10, tzinfo=pytz.UTC)))
removeSecurityProxy(bmp2.source_branch).explicitly_private = True
self.assertEqual(
[bmp1], latest_proposals_for_each_branch([bmp1, bmp2]))
def test_same_target(self):
# If the proposals target the same branch, then the most recent is
# returned.
bmp1 = self.factory.makeBranchMergeProposal(
date_created=(
datetime(year=2008, month=9, day=10, tzinfo=pytz.UTC)))
bmp2 = self.factory.makeBranchMergeProposal(
target_branch=bmp1.target_branch,
date_created=(
datetime(year=2008, month=10, day=10, tzinfo=pytz.UTC)))
self.assertEqual(
[bmp2], latest_proposals_for_each_branch([bmp1, bmp2]))
|