Merge lp:~nigelbabu/launchpad/645825-ui-example into lp:launchpad

[Nigel Babu]

[r=gmb,stevenk] [r=gmb][bug=645825] The ProductSeries:+code-summary page now uses the ProductSeries.name when providing branch URLs rather than just relying on the default series name for the product.

The pages that show, or let me choose, the branch for a productseries tell me I can create the branch with "bzr push." They give a full example command line with the right product name, but the productseries name always seems to be "trunk" rather than the name of the series I'm actually trying to set a branch for. Fixed the hardcoded trunk with name of the series.

[Steve Kowalik (stevenk)]

This change looks great, but I don't think it's ready to land -- I'd like to see some test changes or test additions first.

review: Needs Fixing

[Graham Binns (gmb)]

Blood, sweat, tears and tests. As I mentioned on IRC, the test needs a leading comment explaining the expected behaviour. Other than that, this is good to go.

review: Approve (code)

[Steve Kowalik (stevenk)]

review: Approve (code)

[Graham Binns (gmb)]

There were some test failures in this branch when I ran it through
EC2, but they came shortly after the devel build had failed. I'll
check to make sure that the failures weren't a result of whatever
caused the build failure.

=== added file 'lib/lp/registry/browser/tests/test_productseries_views.py'
--- lib/lp/registry/browser/tests/test_productseries_views.py	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/browser/tests/test_productseries_views.py	2011-05-18 04:15:51 +0000
@@ -0,0 +1,31 @@
+# Copyright 2011 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""View tests for ProductSeries pages."""
+
+__metaclass__ = type
+
+from canonical.testing.layers import DatabaseFunctionalLayer
+from lp.testing import (
+    TestCaseWithFactory,
+    person_logged_in
+    )
+from lp.testing.views import create_initialized_view
+from lp.testing.matchers import Contains
+
+
+class TestProductSeriesHelp(TestCaseWithFactory):
+    layer = DatabaseFunctionalLayer
+    
+    def test_new_series_help(self):
+        # The LP branch URL displayed to the user on the +code-summary page for
+        # a product series will relate to that series instead of to the default
+        # series for the Product.
+        product = self.factory.makeProduct()
+        series = self.factory.makeProductSeries(product=product)
+        person = product.owner
+        ssh_key = self.factory.makeSSHKey(person=person)
+        branch_url = "lp:~%s/%s/%s" % (person.name, product.name, series.name)
+        with person_logged_in(person):
+            view = create_initialized_view(series, '+code-summary')
+            self.assertThat(view(), Contains(branch_url))
 
=== modified file 'lib/lp/registry/templates/productseries-codesummary.pt'
--- lib/lp/registry/templates/productseries-codesummary.pt	2011-01-17 21:03:16 +0000
+++ lib/lp/registry/templates/productseries-codesummary.pt	2011-05-18 04:15:51 +0000
@@ -41,7 +41,7 @@
             <li id="ssh-key-directions">
               Push the branch directly to Launchpad, e.g. with:<br />
               <tt><strong>
-                bzr push lp:~<tal:user replace="view/user/name"/>/<tal:project replace="context/product/name"/>/trunk
+                bzr push lp:~<tal:user replace="view/user/name"/>/<tal:products replace="context/product/name"/>/<tal:series replace="context/name"/>
               </strong></tt>
               <tal:no-keys condition="not:view/user/sshkeys">
                 <br/>To authenticate with the Launchpad branch upload service,
 
=== modified file 'lib/lp/registry/templates/productseries-linkbranch.pt'
--- lib/lp/registry/templates/productseries-linkbranch.pt	2011-01-17 20:39:15 +0000
+++ lib/lp/registry/templates/productseries-linkbranch.pt	2011-05-18 04:15:51 +0000
@@ -28,7 +28,7 @@
             <li id="ssh-key-directions">
               Push the branch directly to Launchpad, e.g. with:<br />
               <tt><strong>
-                bzr push lp:~<tal:user replace="view/user/name"/>/<tal:project replace="context/product/name"/>/trunk
+                bzr push lp:~<tal:user replace="view/user/name"/>/<tal:project replace="context/product/name"/>/<tal:series replace="context/name"/>
               </strong></tt>
               <tal:no-keys condition="not:view/user/sshkeys">
                 <br/>To authenticate with the Launchpad branch upload service,