Merge lp:~twom/launchpad/pending-but-not-merged into lp:launchpad

[Tom Wardill]

Don't show merged or otherwise inactive landing targets on the gitrepository page

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'lib/lp/code/browser/gitrepository.py'
--- lib/lp/code/browser/gitrepository.py	2018-08-30 14:54:37 +0000
+++ lib/lp/code/browser/gitrepository.py	2018-08-31 14:26:04 +0000
@@ -393,8 +393,9 @@
 
     @cachedproperty
     def landing_targets(self):
-        """Return a filtered list of landing targets."""
-        targets = self.context.getPrecachedLandingTargets(self.user)
+        """Return a filtered list of active landing targets."""
+        targets = self.context.getPrecachedLandingTargets(
+            self.user, only_active=True)
         return latest_proposals_for_each_branch(targets)
 
 
 
=== modified file 'lib/lp/code/browser/tests/test_gitrepository.py'
--- lib/lp/code/browser/tests/test_gitrepository.py	2018-08-31 06:29:29 +0000
+++ lib/lp/code/browser/tests/test_gitrepository.py	2018-08-31 14:26:04 +0000
@@ -296,6 +296,27 @@
                 self.assertIsNotNone(
                     find_tag_by_id(browser.contents, 'landing-targets'))
 
+    def test_view_with_inactive_landing_targets(self):
+        product = self.factory.makeProduct(name="foo", vcs=VCSType.GIT)
+        target_repository = self.factory.makeGitRepository(target=product)
+        source_repository = self.factory.makeGitRepository(target=product)
+        target_git_refs = self.factory.makeGitRefs(
+            target_repository,
+            paths=["refs/heads/master", "refs/heads/1.0", "refs/tags/1.1"])
+        source_git_refs = self.factory.makeGitRefs(
+            source_repository,
+            paths=["refs/heads/master"])
+        self.factory.makeBranchMergeProposalForGit(
+            target_ref=target_git_refs[0],
+            source_ref=source_git_refs[0],
+            set_state=BranchMergeProposalStatus.MERGED)
+        with FeatureFixture({"code.git.show_repository_mps": "on"}):
+            with person_logged_in(target_repository.owner):
+                browser = self.getViewBrowser(
+                    source_repository, user=source_repository.owner)
+                self.assertIsNone(
+                    find_tag_by_id(browser.contents, 'landing-targets'))
+
 
 class TestGitRepositoryViewPrivateArtifacts(BrowserTestCase):
     """Tests that Git repositories with private team artifacts can be viewed.
 
=== modified file 'lib/lp/code/model/gitrepository.py'
--- lib/lp/code/model/gitrepository.py	2018-08-29 17:11:57 +0000
+++ lib/lp/code/model/gitrepository.py	2018-08-31 14:26:04 +0000
@@ -71,6 +71,7 @@
     )
 from lp.app.interfaces.services import IService
 from lp.code.enums import (
+    BranchMergeProposalStatus,
     GitObjectType,
     GitRepositoryType,
     )
@@ -887,10 +888,15 @@
             BranchMergeProposal,
             BranchMergeProposal.source_git_repository == self)
 
-    def getPrecachedLandingTargets(self, user):
+    def getPrecachedLandingTargets(self, user, only_active=False):
         """See `IGitRepository`."""
+        results = self.landing_targets
+        if only_active:
+            results = self.landing_targets.find(
+                Not(BranchMergeProposal.queue_status.is_in(
+                    BRANCH_MERGE_PROPOSAL_FINAL_STATES)))
         loader = partial(BranchMergeProposal.preloadDataForBMPs, user=user)
-        return DecoratedResultSet(self.landing_targets, pre_iter_hook=loader)
+        return DecoratedResultSet(results, pre_iter_hook=loader)
 
     @property
     def _api_landing_targets(self):
 
=== modified file 'lib/lp/code/model/tests/test_gitrepository.py'
--- lib/lp/code/model/tests/test_gitrepository.py	2018-07-24 11:57:33 +0000
+++ lib/lp/code/model/tests/test_gitrepository.py	2018-08-31 14:26:04 +0000
@@ -215,6 +215,12 @@
         clear_property_cache(repository)
         self.assertIsNone(repository.code_import)
 
+    def test_getMergeProposals(self):
+        repository = self.factory.makeGitRepository()
+        [ref] = self.factory.makeGitRefs(repository=repository)
+        bmp = self.factory.makeBranchMergeProposalForGit(target_ref=ref)
+        self.assertEqual([bmp], list(repository.getMergeProposals()))
+
 
 class TestGitIdentityMixin(TestCaseWithFactory):
     """Test the defaults and identities provided by GitIdentityMixin."""