Merge lp:~mwhudson/launchpad/bug-444387 into lp:launchpad

[Michael Hudson-Doyle]

[Michael Hudson-Doyle (mwhudson)]

Hi,

This is a one character fix for the linked bug (an obvious mistake in the template) and a somewhat ugly test.

Cheers,
mwh

[Paul Hummer (rockstar)]

review: Approve

=== modified file 'lib/lp/registry/stories/productseries/xx-productseries-link-branch.txt'
--- lib/lp/registry/stories/productseries/xx-productseries-link-branch.txt	2009-09-18 15:24:30 +0000
+++ lib/lp/registry/stories/productseries/xx-productseries-link-branch.txt	2009-10-06 22:05:27 +0000
@@ -23,6 +23,25 @@
 
 The only field shown is the branch field.
 
+    # Add 15 revisions to the branch we're going to link; 10 old ones
+    # and 5 within the last 30 days.
+    >>> import datetime
+    >>> import pytz
+    >>> from zope.component import getUtility
+    >>> from lp.code.interfaces.branch import IBranchSet
+    >>> from lp.testing import time_counter
+    >>> login('[e-mail]')
+    >>> branch = getUtility(IBranchSet).getByUniqueName('~name12/firefox/main')
+    >>> now = datetime.datetime.now(pytz.UTC)
+    >>> day_delta = datetime.timedelta(days=1)
+    >>> factory.makeRevisionsForBranch(
+    ...     branch, count=10, date_generator=time_counter(
+    ...         now - datetime.timedelta(days=50), day_delta))
+    >>> factory.makeRevisionsForBranch(
+    ...     branch, count=5, date_generator=time_counter(
+    ...         now - datetime.timedelta(days=10), day_delta))
+    >>> logout()
+
     >>> print sample_browser.title
     Link an existing branch to...
     >>> sample_browser.getControl('Branch').value = '~name12/firefox/main'
@@ -34,7 +53,15 @@
     Series trunk : Mozilla Firefox
     >>> branch = find_tag_by_id(sample_browser.contents, 'branch-details')
     >>> print extract_text(branch)
-    lp://dev/firefox - Sample Person ...
+    lp://dev/firefox - Sample Person
+    Change branch
+
+The total and recent revision counts for the branch are displayed to
+give an idea of overall and recent activity on the project.
+
+    >>> revisions = find_tag_by_id(sample_browser.contents, 'branch-revision-details')
+    >>> print extract_text(revisions)
+    15 revisions, 5 in the past month.
 
 A helpful informational message is also shown to the user.
 

=== modified file 'lib/lp/registry/templates/productseries-codesummary.pt'
--- lib/lp/registry/templates/productseries-codesummary.pt	2009-09-05 06:40:36 +0000
+++ lib/lp/registry/templates/productseries-codesummary.pt	2009-10-06 22:05:27 +0000
@@ -88,9 +88,9 @@
     <a
       tal:replace="structure context/menu:overview/link_branch/fmt:icon" />
   </div>
-  <div tal:condition="context/branch/revision_count">
+  <div id="branch-revision-details" tal:condition="context/branch/revision_count">
     <span tal:replace="context/branch/revision_count">35</span> revisions,
-    <span talreplace="context/branch/@@+product-summary-listing/recent_revision_count">31</span> in the past month.
+    <span tal:replace="context/branch/@@+product-summary-listing/recent_revision_count">31</span> in the past month.
   </div>
 </tal:block>