Merge lp:~stevenk/launchpad/uploaded-packages-wrong-link into lp:launchpad

[Steve Kowalik]

[r=lifeless][bug=799308] Correct link for questions on ~/+uploaded-packages.

Correct the link for Questions on ~/+uploaded-packages, and add a test for the bug and answers links, since I couldn't locate one.

[Robert Collins (lifeless)]

review: Approve

[Robert Collins (lifeless)]

My only comment is that this:

35 + for suffix in ('+bugs', '+questions'):
36 + self.assertIn('<a href="%s%s">' % (expected_base, suffix), html)

is no shorter, and may well be harder to debug that two separate assertions.

=== modified file 'lib/lp/registry/browser/tests/test_person_view.py'
--- lib/lp/registry/browser/tests/test_person_view.py	2011-05-27 21:12:25 +0000
+++ lib/lp/registry/browser/tests/test_person_view.py	2011-07-14 07:11:13 +0000
@@ -47,6 +47,7 @@
 from lp.registry.model.milestone import milestone_sort_key
 from lp.registry.model.person import Person
 from lp.soyuz.enums import (
+    ArchivePurpose,
     ArchiveStatus,
     PackagePublishingStatus,
     )
@@ -595,6 +596,11 @@
     def setUp(self):
         super(TestPersonUploadedPackagesView, self).setUp()
         self.user = self.factory.makePerson()
+        archive = self.factory.makeArchive(purpose=ArchivePurpose.PRIMARY)
+        spr = self.factory.makeSourcePackageRelease(
+            creator=self.user, archive=archive)
+        self.spph = self.factory.makeSourcePackagePublishingHistory(
+            sourcepackagerelease=spr, archive=archive)
         self.view = create_initialized_view(self.user, '+uploaded-packages')
 
     def test_view_helper_attributes(self):
@@ -605,6 +611,15 @@
             config.launchpad.default_batch_size,
             self.view.max_results_to_display)
 
+    def test_verify_bugs_and_answers_links(self):
+        # Verify the links for bugs and answers point to locations that
+        # exist.
+        html = self.view()
+        expected_base = '/%s/+source/%s' % (
+            self.spph.distroseries.distribution.name,
+            self.spph.source_package_name)
+        self.assertIn('<a href="%s/+bugs">' % expected_base, html)
+        self.assertIn('<a href="%s/+questions">' % expected_base, html)
 
 class TestPersonPPAPackagesView(TestCaseWithFactory):
     """Test the maintained packages view."""

=== modified file 'lib/lp/registry/templates/person-macros.pt'
--- lib/lp/registry/templates/person-macros.pt	2011-02-01 19:16:43 +0000
+++ lib/lp/registry/templates/person-macros.pt	2011-07-14 07:11:13 +0000
@@ -173,7 +173,7 @@
       </a>
     </td>
     <td style="text-align: right">
-      <a tal:attributes="href string:${spr/sourcepackage/fmt:url}/+questions"
+      <a tal:attributes="href string:${spr/distrosourcepackage/fmt:url}/+questions"
          tal:content="spr/open_questions">
       </a>
     </td>