Merge lp:~deryck/launchpad/move-pagetests-bug-583472 into lp:launchpad

[Deryck Hodge]

Move +text and cve page tests from lp.bugs.pagetests to lp.bugs.stories.

This branch moves some page tests that had somehow landed in
lp.bugs.pagetests instead of lp.bugs.stories. These tests were not
being run, so I had to do some work to get them running.

Most of this work was making the CVE pages and test fit the 3.0 design
better. I also fixed up an import for the +text page test.

Cheers,
deryck

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/bugs/templates/malone-portlet-stats.pt
  lib/lp/bugs/templates/cve-portlet-bugs2.pt
  lib/lp/bugs/browser/cve.py
  lib/lp/bugs/stories/bugs/xx-bug-text-pages.txt
  lib/lp/bugs/templates/cveset-index.pt
  lib/lp/bugs/stories/cve/cve-pages.txt

[Abel Deuring (adeuring)]

review: Approve (code)

=== modified file 'lib/lp/bugs/browser/cve.py'
--- lib/lp/bugs/browser/cve.py	2009-09-16 13:44:15 +0000
+++ lib/lp/bugs/browser/cve.py	2010-05-21 14:05:49 +0000
@@ -129,6 +129,9 @@
         if self.text:
             self.pre_search()
 
+    label = 'Launchpad CVE tracker'
+    page_title = label
+
     def getAllBatched(self):
         return BatchNavigator(self.context.getAll(), self.request)
 

=== removed directory 'lib/lp/bugs/pagetests'
=== removed directory 'lib/lp/bugs/pagetests/bugs'
=== removed directory 'lib/lp/bugs/pagetests/cve'
=== renamed file 'lib/lp/bugs/pagetests/bugs/xx-bug-text-pages.txt' => 'lib/lp/bugs/stories/bugs/xx-bug-text-pages.txt'
--- lib/lp/bugs/pagetests/bugs/xx-bug-text-pages.txt	2009-08-13 15:12:16 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-text-pages.txt	2010-05-21 14:05:49 +0000
@@ -10,7 +10,8 @@
     >>> import StringIO
     >>> from canonical.database.sqlbase import flush_database_updates
     >>> from canonical.launchpad.ftests import login, logout
-    >>> from canonical.launchpad.database import Bug, Person
+    >>> from lp.bugs.model.bug import Bug
+    >>> from lp.registry.model.person import Person
     >>> login("[e-mail]")
     >>> mark = Person.selectOneBy(name="mark")
     >>> mark.displayname = u"M\xe1rk Sh\xfattlew\xf2rth"

=== renamed file 'lib/lp/bugs/pagetests/cve/cve-pages.txt' => 'lib/lp/bugs/stories/cve/cve-pages.txt'
--- lib/lp/bugs/pagetests/cve/cve-pages.txt	2009-09-23 11:10:00 +0000
+++ lib/lp/bugs/stories/cve/cve-pages.txt	2010-05-21 14:05:49 +0000
@@ -7,7 +7,7 @@
     >>> browser.open('http://bugs.launchpad.dev/')
     >>> browser.url
     'http://bugs.launchpad.dev/'
-    >>> print find_tag_by_id(browser.contents, 'application-footer')
+    >>> print find_tag_by_id(browser.contents, 'malone-stats')
     <...2...bugs are related to...CVE entries...
 
 "CVE entries" links to the main CVEs page, which has the same
@@ -18,10 +18,10 @@
     >>> print browser.url
     http://bugs.launchpad.dev/bugs/cve
     >>> print_location(browser.contents)
-    Hierarchy: Launchpad
+    Hierarchy: None displayed
     Tabs:
     * Launchpad Home - http://launchpad.dev/
-    * Branches - http://code.launchpad.dev/
+    * Code - http://code.launchpad.dev/
     * Bugs (selected) - http://bugs.launchpad.dev/
     * Blueprints - http://blueprints.launchpad.dev/
     * Translations - http://translations.launchpad.dev/
@@ -34,19 +34,19 @@
 
 The main CVEs page links to a list of all registered CVEs.
 
-    >>> browser.getLink('All registered CVEs').click()
+    >>> browser.getLink('Show all registered CVEs').click()
     >>> print browser.url
     http://bugs.launchpad.dev/bugs/cve/+all
     >>> print_location(browser.contents)
-    Hierarchy: Launchpad
+    Hierarchy: None displayed
     Tabs:
     * Launchpad Home - http://launchpad.dev/
-    * Branches - http://code.launchpad.dev/
+    * Code - http://code.launchpad.dev/
     * Bugs (selected) - http://bugs.launchpad.dev/
     * Blueprints - http://blueprints.launchpad.dev/
     * Translations - http://translations.launchpad.dev/
     * Answers - http://answers.launchpad.dev/
-    Main heading: All registered CVEs
+    Main heading: Launchpad CVE tracker
 
 Now, we will test the search functionality of the CVE tracker. First we
 will search for the word "loss" in the database and see how many show
@@ -83,10 +83,10 @@
 
     >>> anon_browser.open('http://launchpad.dev/bugs/cve/2005-2737')
     >>> print_location(anon_browser.contents)
-    Hierarchy: Launchpad
+    Hierarchy: None displayed
     Tabs:
     * Launchpad Home - http://launchpad.dev/
-    * Branches - http://code.launchpad.dev/
+    * Code - http://code.launchpad.dev/
     * Bugs (selected) - http://bugs.launchpad.dev/
     * Blueprints - http://blueprints.launchpad.dev/
     * Translations - http://translations.launchpad.dev/
@@ -105,8 +105,7 @@
   >>> for tag in find_tags_by_class(
   ...     anon_browser.contents, 'menu-link-linkbug'):
   ...     print tag
-  <a href="http://launchpad.dev/bugs/cve/2005-2737/+linkbug"
-     class="menu-link-linkbug">Link to bug</a>
+  <a href="+linkbug" class="menu-link-linkbug sprite add">Link to bug</a>
   >>> 'Candidate' in anon_browser.contents
   True
   >>> 'http://marc.theaimsgroup.com/?l=bugtraq&amp;m=112511025414488&amp;w=2">20050826 Multiple PHP' in anon_browser.contents

=== modified file 'lib/lp/bugs/templates/cve-portlet-bugs2.pt'
--- lib/lp/bugs/templates/cve-portlet-bugs2.pt	2009-11-14 16:08:12 +0000
+++ lib/lp/bugs/templates/cve-portlet-bugs2.pt	2010-05-21 14:05:49 +0000
@@ -18,10 +18,10 @@
 
       <p tal:condition="not: links"><i>No related bugs.</i></p>
     </div>
-    
+
     <ul>
       <li>
-        <a href="+linkbug" class="sprite add">Link to bug</a>
+        <a href="+linkbug" class="menu-link-linkbug sprite add">Link to bug</a>
       </li>
       <li condition="context/bugs">
         <a href="+unlinkbug" class="sprite remove">Remove bug link</a>

=== modified file 'lib/lp/bugs/templates/cveset-index.pt'
--- lib/lp/bugs/templates/cveset-index.pt	2009-09-07 13:38:16 +0000
+++ lib/lp/bugs/templates/cveset-index.pt	2010-05-21 14:05:49 +0000
@@ -13,8 +13,6 @@
 
 <div metal:fill-slot="main">
 
-  <h1>Launchpad CVE tracker</h1>
-
   <form method="post" style="margin-top: 1em; margin-bottom: 1em;">
     <div>Find CVEs by number or keywords:</div>
     <div>

=== modified file 'lib/lp/bugs/templates/malone-portlet-stats.pt'
--- lib/lp/bugs/templates/malone-portlet-stats.pt	2010-03-18 18:55:02 +0000
+++ lib/lp/bugs/templates/malone-portlet-stats.pt	2010-05-21 14:05:49 +0000
@@ -2,7 +2,7 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  class="portlet">
+  class="portlet" id="malone-stats">
   <h2>Statistics</h2>
   <ul>
     <li>