Merge lp:~mwhudson/launchpad/branchlisting-series-link-bug-457999 into lp:launchpad

[Michael Hudson-Doyle]

On a branchlisting page, for a series branch the link to the series now goes to the series on the main site.

[Michael Hudson-Doyle (mwhudson)]

Curtis' diagnosis on the bug is correct.

One of those where the test took 100 times longer than the fix -- but the fix only took 5 seconds, so that's probably OK.

Cheers,
mwh

[Paul Hummer (rockstar)]

On Wed, 28 Oct 2009 23:50:27 -0000
Michael Hudson <email address hidden> wrote:
> One of those where the test took 100 times longer than the fix -- but the fix
> only took 5 seconds, so that's probably OK.

Yea, the test is a little more involved than the fix. :)

 review approve
 merge approved

Cheers,
Paul

review: Approve

=== modified file 'lib/lp/code/browser/tests/test_branchlisting.py'
--- lib/lp/code/browser/tests/test_branchlisting.py	2009-10-21 01:24:58 +0000
+++ lib/lp/code/browser/tests/test_branchlisting.py	2009-10-28 23:50:26 +0000
@@ -7,8 +7,11 @@
 
 from datetime import timedelta
 from pprint import pformat
+import re
 import unittest
 
+from lazr.uri import URI
+
 from storm.expr import Asc, Desc
 from zope.component import getUtility
 from zope.security.proxy import removeSecurityProxy
@@ -25,6 +28,7 @@
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.testing import TestCase, TestCaseWithFactory, time_counter
 from lp.testing.views import create_initialized_view
+from canonical.launchpad.webapp import canonical_url
 from canonical.launchpad.webapp.servers import LaunchpadTestRequest
 from canonical.testing.layers import DatabaseFunctionalLayer
 
@@ -330,6 +334,22 @@
         self.assertEqual(identity, view_branch.bzr_identity)
 
 
+class TestProductSeriesTemplate(TestCaseWithFactory):
+
+    layer = DatabaseFunctionalLayer
+
+    def test_product_series_link(self):
+        # The link from a series branch's listing to the series goes to the
+        # series on the main site, not the code site.
+        branch = self.factory.makeProductBranch()
+        series = self.factory.makeProductSeries(product=branch.product)
+        series.branch = branch
+        browser = self.getUserBrowser(
+            canonical_url(branch.product, rootsite='code'))
+        link = browser.getLink(re.compile('^' + series.name + '$'))
+        self.assertEqual('launchpad.dev', URI(link.url).host)
+
+
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 

=== modified file 'lib/lp/code/templates/branch-listing.pt'
--- lib/lp/code/templates/branch-listing.pt	2009-08-18 22:26:02 +0000
+++ lib/lp/code/templates/branch-listing.pt	2009-10-28 23:50:26 +0000
@@ -249,7 +249,7 @@
               link rather than having a space after it.
             </tal:comment>
             <tal:series-link>
-              <a tal:attributes="href series/fmt:url" tal:content="series/name">
+              <a tal:attributes="href series/fmt:url:mainsite" tal:content="series/name">
                 trunk
               </a></tal:series-link><tal:comma condition="not: repeat/series/end">,</tal:comma>
           </tal:associated-series>