Merge lp://qastaging/~sinzui/launchpad/answers-ui-fixes into lp://qastaging/launchpad

This is my branch to fix faq and question 3.0 bugs.

    lp:~sinzui/launchpad/faqs-ui-fixes
    Diff size: 562
    Launchpad bug: https://bugs.launchpad.net/bugs/435743
                   https://bugs.launchpad.net/bugs/435973
                   https://bugs.launchpad.net/bugs/434715
    Test command: /bin/test -vvc -t answers.*(browser|stories)
    Pre-implementation: no one
    Target release: 3.1.11

= Convert faq layouts to 3.0 =

Bug 435743 [Bread crumb missing for question and FAQ]
    The last segment of the breadcrumb is missing.

Bug 435973 [FAQ page headings are too verbose]
    The heading should be the FAQ title, but it contains the project and
    id that is expected to appear in the breadcrumbs

Bug 434715 [Button for asking a question is labeled "Add"]
    Change the action from Add to Post Question,

== Rules ==

Bug 435743 [Bread crumb missing for question and FAQ]
    * The FAQ is missing a Breadcrumb adapter; add one:
      FAQ #1234

Bug 435973 [FAQ page headings are too verbose]
    * The heading should be the FAQ title, no more.

Bug 434715 [Button for asking a question is labeled "Add"]
    Change the action from Add to Post Question.

== QA ==

Bug 435743 [Bread crumb missing for question and FAQ]
    Visit an FAQ and verify the breadcrumbs are:
    <project> : questions : faqs : FAQ #<id>

Bug 435973 [FAQ page headings are too verbose]
    Visit an FAQ and verify that the FAQ title is the entire heading

Bug 434715 [Button for asking a question is labeled "Add"]
    Verify the action to create a question is Post Question,

== Lint ==

Linting changed files:
  lib/lp/answers/browser/configure.zcml
  lib/lp/answers/browser/faq.py
  lib/lp/answers/browser/question.py
  lib/lp/answers/browser/tests/test_breadcrumbs.py
  lib/lp/answers/stories/faq-add.txt
  lib/lp/answers/stories/faq-browse-and-search.txt
  lib/lp/answers/stories/faq-edit.txt
  lib/lp/answers/stories/project-add-question.txt
  lib/lp/answers/stories/question-add-in-other-languages.txt
  lib/lp/answers/stories/question-add.txt
  lib/lp/answers/stories/question-answer-contact.txt
  lib/lp/answers/stories/question-browse-and-search.txt
  lib/lp/answers/stories/question-message.txt
  lib/lp/answers/stories/question-obfuscation.txt
  lib/lp/answers/stories/question-overview.txt
  lib/lp/answers/stories/this-is-a-faq.txt

== Test ==

    * lib/lp/answers/browser/tests/test_breadcrumbs.py
      * Added tests for FAQ and Question Breadcrumbs
    * lib/lp/answers/stories/faq-add.txt
      * Updated tests to verify FAQ titles.
    * lib/lp/answers/stories/faq-browse-and-search.txt
      * Updated tests to verify FAQ titles.
    * lib/lp/answers/stories/faq-edit.txt
      * Updated tests to verify FAQ titles.
    * lib/lp/answers/stories/project-add-question.txt
      * Updated tests to verify the create action is Post Question.
      * Updated tests to verify Question titles.
    * lib/lp/answers/stories/question-add-in-other-languages.txt
      * Updated tests to verify the create action is Post Question.
      * Updated tests to verify Question titles.
    * lib/lp/answers/stories/question-add.txt
      * Updated tests to verify the create action is Post Qu...

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Am 01.11.2009 06:30, Curtis Hovey schrieb:
> Curtis Hovey has proposed merging lp:~sinzui/launchpad/answers-ui-fixes into lp:launchpad/devel.
> This is my branch to fix faq and question 3.0 bugs.

Wonderful! Thank you for doing this, including the tedious work of
fixing all tests. Thank you. I am just curious, why you changed some
page title tests to leave out the greater context, like this:

> - Questions : Ubuntu
> + Question #11 : ...

since you did this in other places:

> - Questions : Ubuntu
> + FAQ #4 : Questions : Ubuntu

No big deal, but it actually seems more work to me to remove the context
and I just wonder if you did it consciously.

One more thing:

> === modified file 'lib/lp/answers/browser/tests/test_breadcrumbs.py'
> --- lib/lp/answers/browser/tests/test_breadcrumbs.py 2009-09-22 18:45:02 +0000
> +++ lib/lp/answers/browser/tests/test_breadcrumbs.py 2009-11-01 05:30:29 +0000
> @@ -9,6 +9,8 @@
> from canonical.launchpad.webapp.tests.breadcrumbs import (
> BaseBreadcrumbTestCase)
>
> +from lp.testing import login_person
> +
>
> class TestQuestionTargetProjectAndPersonBreadcrumbOnAnswersVHost(
> BaseBreadcrumbTestCase):
> @@ -55,5 +57,31 @@
> self.assertEquals(last_crumb.text, 'Questions')
>
>
> +class TestAnswersBreadcrumb(BaseBreadcrumbTestCase):
> + """Test Breadcrumbs for answer module objects."""
> +
> + def setUp(self):
> + super(TestAnswersBreadcrumb, self).setUp()
> + self.product = self.factory.makeProduct(name="mellon")
> + login_person(self.product.owner)
> + self.question = self.factory.makeQuestion(
> + target=self.product, title='Seeds are hard to chew')
> + self.question_url = canonical_url(self.question, rootsite='answers')

self.question and self.question_url are not needed in all tests, are
they? I think they should be local to test_question.

> + self.faq = self.factory.makeFAQ(target=self.product, title='Seedless')
> + self.faq_url = canonical_url(self.faq, rootsite='answers')

Same goes for self.faq and self.faq_url

> +
> + def test_question(self):

question = ...
question_url = ...

(You get my point ... ;-)

> + crumbs = self._getBreadcrumbs(
> + self.question_url, [self.root, self.product, self.question])
> + last_crumb = crumbs[-1]
> + self.assertEquals(last_crumb.text, 'Question #%d' % self.question.id)
> +
> + def test_faq(self):
> + crumbs = self._getBreadcrumbs(
> + self.faq_url, [self.root, self.product, self.faq])
> + last_crumb = crumbs[-1]
> + self.assertEquals(last_crumb.text, 'FAQ #%d' % self.faq.id)
> +
> +
> def test_suite():
> return unittest.TestLoader().loadTestsFromName(__name__)

 review approve code
 merge approved

Cheers,
Henning
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkrux6QACgkQBT3oW1L17iiQQwCg3MatFcXV44ulMsjsmf10Ihwx
AfsAoMHKgRGxivRfTfQij6B397j4/uIR
=dWuq
-----END PGP SIGNATURE-----

On Mon, 2009-11-02 at 11:51 +0000, Henning Eggers wrote:
> Review: Approve code
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Am 01.11.2009 06:30, Curtis Hovey schrieb:
> > Curtis Hovey has proposed merging lp:~sinzui/launchpad/answers-ui-fixes into lp:launchpad/devel.
> > This is my branch to fix faq and question 3.0 bugs.
>
> Wonderful! Thank you for doing this, including the tedious work of
> fixing all tests. Thank you. I am just curious, why you changed some
> page title tests to leave out the greater context, like this:
>
> > - Questions : Ubuntu
> > + Question #11 : ...
>
> since you did this in other places:
>
> > - Questions : Ubuntu
> > + FAQ #4 : Questions : Ubuntu
>
> No big deal, but it actually seems more work to me to remove the context
> and I just wonder if you did it consciously.

I wanted to know all "add question" or "retarget question" titles
because the pillar is not always the same as it was.

I ellipsised the other titles that user is viewing because the
breadcrumb/title rules are well tested. These will not break if a
retargeting test is inserted.

> One more thing:
>
> > === modified file 'lib/lp/answers/browser/tests/test_breadcrumbs.py'
> > --- lib/lp/answers/browser/tests/test_breadcrumbs.py 2009-09-22 18:45:02 +0000
> > +++ lib/lp/answers/browser/tests/test_breadcrumbs.py 2009-11-01 05:30:29 +0000
...
> > +class TestAnswersBreadcrumb(BaseBreadcrumbTestCase):
> > + """Test Breadcrumbs for answer module objects."""
> > +
> > + def setUp(self):
> > + super(TestAnswersBreadcrumb, self).setUp()
> > + self.product = self.factory.makeProduct(name="mellon")
> > + login_person(self.product.owner)
> > + self.question = self.factory.makeQuestion(
> > + target=self.product, title='Seeds are hard to chew')
> > + self.question_url = canonical_url(self.question, rootsite='answers')
>
> self.question and self.question_url are not needed in all tests, are
> they? I think they should be local to test_question.

I moved them.

--
__Curtis C. Hovey_________
http://launchpad.net/