| {{ "Maintainer" | tr }}: |
- {% if request.user.is_authenticated() and pkgbase.Maintainer %}
+ {% if pkgbase.Maintainer %}
{{ pkgbase.Maintainer.Username }}
+ {% if comaintainers %}
+ ({% for co in comaintainers %}{{ co.User }}{% endfor %})
+ {% endif %}
{% else %}
{{ pkgbase.Maintainer.Username | default("None" | tr) }}
{% endif %}
diff --git a/test/test_homepage.py b/test/test_homepage.py
index 5d3bc711..63b832e3 100644
--- a/test/test_homepage.py
+++ b/test/test_homepage.py
@@ -36,6 +36,14 @@ def user():
yield user
+@pytest.fixture
+def user2():
+ with db.begin():
+ user = db.create(User, Username="test2", Email="test2@example.org",
+ Passwd="testPassword", AccountTypeID=USER_ID)
+ yield user
+
+
@pytest.fixture
def redis():
redis = redis_connection()
@@ -54,6 +62,17 @@ def redis():
delete_keys()
+@pytest.fixture
+def package(user: User) -> Package:
+ now = time.utcnow()
+ with db.begin():
+ pkgbase = db.create(PackageBase, Name="test-pkg",
+ Maintainer=user, Packager=user,
+ SubmittedTS=now, ModifiedTS=now)
+ pkg = db.create(Package, PackageBase=pkgbase, Name=pkgbase.Name)
+ yield pkg
+
+
@pytest.fixture
def packages(user):
""" Yield a list of num_packages Package objects maintained by user. """
@@ -221,3 +240,36 @@ def test_homepage_dashboard_flagged_packages(redis, packages, user):
flagged_pkg = root.xpath('//table[@id="flagged-packages"]/tbody/tr').pop(0)
flagged_name = flagged_pkg.xpath('./td/a').pop(0)
assert flagged_name.text.strip() == pkg.Name
+
+
+def test_homepage_dashboard_flagged(user: User, user2: User, package: Package):
+ pkgbase = package.PackageBase
+
+ now = time.utcnow()
+ with db.begin():
+ db.create(PackageComaintainer, User=user2,
+ PackageBase=pkgbase, Priority=1)
+ pkgbase.OutOfDateTS = now - 5
+ pkgbase.Flagger = user
+
+ # Test that a comaintainer viewing the dashboard shows them their
+ # flagged co-maintained packages.
+ comaint_cookies = {"AURSID": user2.login(Request(), "testPassword")}
+ with client as request:
+ resp = request.get("/", cookies=comaint_cookies)
+ assert resp.status_code == int(HTTPStatus.OK)
+
+ root = parse_root(resp.text)
+ flagged = root.xpath('//table[@id="flagged-packages"]//tr/td/a')[0]
+ assert flagged.text.strip() == package.Name
+
+ # Test that a maintainer viewing the dashboard shows them their
+ # flagged maintained packages.
+ cookies = {"AURSID": user.login(Request(), "testPassword")}
+ with client as request:
+ resp = request.get("/", cookies=cookies)
+ assert resp.status_code == int(HTTPStatus.OK)
+
+ root = parse_root(resp.text)
+ flagged = root.xpath('//table[@id="flagged-packages"]//tr/td/a')[0]
+ assert flagged.text.strip() == package.Name
diff --git a/test/test_pkgbase_routes.py b/test/test_pkgbase_routes.py
index 17f69811..3f5a791a 100644
--- a/test/test_pkgbase_routes.py
+++ b/test/test_pkgbase_routes.py
@@ -253,6 +253,31 @@ def test_pkgbase(client: TestClient, package: Package):
assert pkgs[i].text.strip() == name
+def test_pkgbase_maintainer(client: TestClient, user: User, maintainer: User,
+ package: Package):
+ """
+ Test that the Maintainer field is beind displayed correctly.
+
+ Co-maintainers are displayed, if they exist, within a parens after
+ the maintainer.
+ """
+ with db.begin():
+ db.create(PackageComaintainer, User=user,
+ PackageBase=package.PackageBase,
+ Priority=1)
+
+ with client as request:
+ resp = request.get(f"/pkgbase/{package.Name}")
+ assert resp.status_code == int(HTTPStatus.OK)
+
+ root = parse_root(resp.text)
+
+ maint = root.xpath('//table[@id="pkginfo"]/tr[@class="pkgmaint"]/td')[0]
+ maint, comaint = maint.xpath('./a')
+ assert maint.text.strip() == maintainer.Username
+ assert comaint.text.strip() == user.Username
+
+
def test_pkgbase_voters(client: TestClient, tu_user: User, package: Package):
pkgbase = package.PackageBase
endpoint = f"/pkgbase/{pkgbase.Name}/voters"
|