=== modified file 'lib/lp/code/browser/tests/test_gitlisting.py'
--- lib/lp/code/browser/tests/test_gitlisting.py 2018-08-20 23:33:01 +0000
+++ lib/lp/code/browser/tests/test_gitlisting.py 2018-08-22 14:28:01 +0000
@@ -10,7 +10,9 @@
from zope.component import getUtility
from lp.app.enums import InformationType
+from lp.code.enums import BranchMergeProposalStatus
from lp.code.interfaces.gitrepository import IGitRepositorySet
+from lp.registry.enums import VCSType
from lp.registry.model.persondistributionsourcepackage import (
PersonDistributionSourcePackage,
)
@@ -24,6 +26,7 @@
)
from lp.testing.layers import DatabaseFunctionalLayer
from lp.testing.matchers import BrowsesWithQueryLimit
+from lp.testing.pages import find_tag_by_id
from lp.testing.views import create_initialized_view
@@ -116,7 +119,7 @@
repository=other_repo, user=other_repo.owner)
self.assertThat(
- self.target, BrowsesWithQueryLimit(34, self.owner, '+git'))
+ self.target, BrowsesWithQueryLimit(36, self.owner, '+git'))
def test_copes_with_no_default(self):
self.factory.makeGitRepository(
@@ -320,10 +323,28 @@
def setUp(self):
super(TestProductGitListingView, self).setUp()
self.owner = self.factory.makePerson(name="foowner")
- self.target = self.factory.makeProduct(name="foo", owner=self.owner)
+ self.target = self.factory.makeProduct(name="foo", owner=self.owner,
+ vcs=VCSType.GIT)
self.target_path = "foo"
self.branch_target = self.target
+ def test_active_reviews_link(self):
+ main_repo = self.factory.makeGitRepository(
+ owner=self.owner, target=self.target, name="foo")
+ git_refs = self.factory.makeGitRefs(
+ main_repo,
+ paths=["refs/heads/master", "refs/heads/1.0", "refs/tags/1.1"])
+
+ with admin_logged_in():
+ getUtility(IGitRepositorySet).setDefaultRepository(
+ target=self.target, repository=main_repo)
+
+ self.factory.makeBranchMergeProposalForGit(
+ target_ref=git_refs[0],
+ set_state=BranchMergeProposalStatus.NEEDS_REVIEW)
+ view = create_initialized_view(self.target, '+git')
+ self.assertIsNotNone(find_tag_by_id(view(), 'active-review-count'))
+
class TestPersonProductGitListingView(TestPersonTargetGitListingView,
TestCaseWithFactory):
=== modified file 'lib/lp/code/templates/gitlisting.pt'
--- lib/lp/code/templates/gitlisting.pt 2015-12-15 23:45:52 +0000
+++ lib/lp/code/templates/gitlisting.pt 2018-08-22 14:28:01 +0000
@@ -63,6 +63,14 @@
+