Merge lp:~jcsackett/launchpad/get-loc-for-bugtracker-fix into lp:launchpad

Proposed by j.c.sackett
Status: Merged
Approved by: Curtis Hovey
Approved revision: no longer in the source branch.
Merged at revision: 15965
Proposed branch: lp:~jcsackett/launchpad/get-loc-for-bugtracker-fix
Merge into: lp:launchpad
Prerequisite: lp:~jcsackett/launchpad/bug-tracker-inactive-projects
Diff against target: 71 lines (+13/-37)
2 files modified
lib/lp/bugs/browser/tests/test_bugtracker_views.py (+13/-0)
lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt (+0/-37)
To merge this branch: bzr merge lp:~jcsackett/launchpad/get-loc-for-bugtracker-fix
Reviewer Review Type Date Requested Status
Curtis Hovey (community) code Approve
Review via email: mp+124528@code.launchpad.net

Commit message

Do not show deactivated projects on but tracker pages.

Description of the change

Summary
=======
This branch gains LoC for a related bugfix by removing unnecessary doctest and
creating equivalent unit tests.

Implementation
==============
The doctest for the related project portlet is removed. There's not much worth
"documenting" and this was largely testing behavior. A unit test is added to
the bugtracker view test to ensure this behavior remains tested.

Tests
=====
bin/test -vvct test_bugtracker_view

QA
==
None

LoC
===
This removes LoC.

Lint
====

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/bugs/browser/tests/test_bugtracker_views.py
  lib/lp/bugs/browser/bugtracker.py
  lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt

To post a comment you must log in.
Revision history for this message
Curtis Hovey (sinzui) wrote :

Thank you.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/bugs/browser/tests/test_bugtracker_views.py'
--- lib/lp/bugs/browser/tests/test_bugtracker_views.py 2012-09-14 21:44:35 +0000
+++ lib/lp/bugs/browser/tests/test_bugtracker_views.py 2012-09-14 21:44:35 +0000
@@ -24,7 +24,20 @@
2424
25 layer = DatabaseFunctionalLayer25 layer = DatabaseFunctionalLayer
2626
27 def test_related_projects(self):
28 # Related products and projectgroups are shown by the view.
29 tracker = self.factory.makeBugTracker()
30 project_group = self.factory.makeProject()
31 product = self.factory.makeProduct()
32 admin = getUtility(ILaunchpadCelebrities).admin.teamowner
33 with person_logged_in(admin):
34 project_group.bugtracker = tracker
35 product.bugtracker = tracker
36 view = create_initialized_view(tracker, name='+index')
37 self.assertEqual([project_group, product], view.related_projects)
38
27 def test_linked_projects_only_shows_active_projects(self):39 def test_linked_projects_only_shows_active_projects(self):
40 # Inactive projects are not shown as the related projects.
28 tracker = self.factory.makeBugTracker()41 tracker = self.factory.makeBugTracker()
29 active_product = self.factory.makeProduct()42 active_product = self.factory.makeProduct()
30 inactive_product = self.factory.makeProduct()43 inactive_product = self.factory.makeProduct()
3144
=== modified file 'lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt'
--- lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt 2012-07-17 14:29:17 +0000
+++ lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt 2012-09-14 21:44:35 +0000
@@ -688,43 +688,6 @@
688 Copy, Cut and Delete operations should work on selections688 Copy, Cut and Delete operations should work on selections
689 --> —: None689 --> —: None
690690
691
692Related projects portlet
693------------------------
694
695Related projects and project groups are shown in a portlet on the bug
696tracker page.
697
698First we need to change a project group and a project to use our new bug
699tracker:
700
701 >>> admin_browser.open('http://launchpad.dev/mozilla/+edit')
702 >>> admin_browser.getControl('Bug Tracker:').value = 'testbugzilla'
703 >>> admin_browser.getControl('Change Details').click()
704
705 >>> admin_browser.open(
706 ... 'http://launchpad.dev/jokosher/+configure-bugtracker')
707 >>> admin_browser.getControl(name='field.bugtracker'
708 ... ).displayValue = ['In a registered bug tracker:']
709 >>> admin_browser.getControl(name='field.bugtracker.bugtracker'
710 ... ).value = 'testbugzilla'
711 >>> admin_browser.getControl('Change').click()
712
713Now the Mozilla Project and Jokosher will appear in the Related projects
714portlet on the bug tracker page:
715
716 >>> admin_browser.open(
717 ... 'http://launchpad.dev/bugs/bugtrackers/testbugzilla')
718 >>> print extract_text(find_portlet(
719 ... admin_browser.contents, 'Related projects'))
720 Related projects
721 You can link a registered project to a
722 registered bug tracker in the project's “Change
723 details” page.
724 The Mozilla Project
725 Jokosher
726
727
728Info portlet691Info portlet
729------------692------------
730693