Launchpad itself

Merge lp://qastaging/~deryck/launchpad/comment-button-capitalization-415253 into lp://qastaging/launchpad

  1. comment-button-capitalization-415253
  2. Merge into devel
Proposed by Deryck Hodge
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~deryck/launchpad/comment-button-capitalization-415253
Merge into: lp://qastaging/launchpad
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~deryck/launchpad/comment-button-capitalization-415253
Reviewer Review Type Date Requested Status
Abel Deuring (community) Approve
Review via email: mp+10848@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Deryck Hodge (deryck) wrote :

This is a clean up branch to change 'Post comment' to 'Post Comment'.
See bug 415253.

This was undertaken while doing some template updates for 3.0, but I
moved it to its own branch given all the lines of tests that needed
updating.

= 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/stories/bugattachments/xx-delete-bug-attachment.txt
  lib/lp/bugs/stories/bugattachments/xx-display-filesize-attachment.txt
  lib/lp/bugs/browser/bugmessage.py
  lib/lp/bugs/stories/bugs/80-add-comment.txt
  lib/lp/bugs/stories/bugs/xx-bug-comments-truncated.txt
  lib/lp/bugs/stories/bugs/xx-bug-hidden-comments.txt
  lib/lp/bugs/stories/bugs/xx-bug-activity.txt
  lib/lp/bugs/stories/bugattachments/40-search-bug-attachments.txt
  lib/lp/bugs/stories/bugs/xx-bug-comment-attach-file.txt
  lib/lp/bugs/stories/bugs/xx-add-comment-with-bugwatch-and-cve.txt
  lib/lp/bugs/stories/bugs/xx-incomplete-bugs.txt
  lib/lp/bugs/stories/bugattachments/10-add-bug-attachment.txt

lib/lp/bugs/stories/bugs/xx-add-comment-distribution-no-current-release.txt

Revision history for this message
Abel Deuring (adeuring) wrote :

Hi Deryck,

Thanks for fixing this.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/bugs/browser/bugmessage.py'
--- lib/lp/bugs/browser/bugmessage.py 2009-08-20 02:46:12 +0000
+++ lib/lp/bugs/browser/bugmessage.py 2009-08-28 14:31:15 +0000
@@ -54,7 +54,7 @@
54 self.addError("Either a comment or attachment "54 self.addError("Either a comment or attachment "
55 "must be provided.")55 "must be provided.")
5656
57 @action(u"Post comment", name='save')57 @action(u"Post Comment", name='save')
58 def save_action(self, action, data):58 def save_action(self, action, data):
59 """Add the comment and/or attachment."""59 """Add the comment and/or attachment."""
6060
6161
=== modified file 'lib/lp/bugs/stories/bugattachments/10-add-bug-attachment.txt'
--- lib/lp/bugs/stories/bugattachments/10-add-bug-attachment.txt 2009-08-06 14:55:50 +0000
+++ lib/lp/bugs/stories/bugattachments/10-add-bug-attachment.txt 2009-08-28 14:31:15 +0000
@@ -25,7 +25,7 @@
25 >>> user_browser.getControl('Description').value = ' Some information '25 >>> user_browser.getControl('Description').value = ' Some information '
26 >>> user_browser.getControl(26 >>> user_browser.getControl(
27 ... name="field.comment").value = 'Added some information'27 ... name="field.comment").value = 'Added some information'
28 >>> user_browser.getControl('Post comment').click()28 >>> user_browser.getControl('Post Comment').click()
2929
30After we added the attachment, we get redirected to the bug page.30After we added the attachment, we get redirected to the bug page.
3131
@@ -61,7 +61,7 @@
61 ... bar_file, 'text/plain', 'bar.txt')61 ... bar_file, 'text/plain', 'bar.txt')
62 >>> user_browser.getControl('Description').value = ''62 >>> user_browser.getControl('Description').value = ''
63 >>> user_browser.getControl(name="field.comment").value = ''63 >>> user_browser.getControl(name="field.comment").value = ''
64 >>> user_browser.getControl('Post comment').click()64 >>> user_browser.getControl('Post Comment').click()
65 >>> user_browser.url65 >>> user_browser.url
66 'http://bugs.launchpad.dev/firefox/+bug/1'66 'http://bugs.launchpad.dev/firefox/+bug/1'
6767
6868
=== modified file 'lib/lp/bugs/stories/bugattachments/40-search-bug-attachments.txt'
--- lib/lp/bugs/stories/bugattachments/40-search-bug-attachments.txt 2009-08-06 14:55:50 +0000
+++ lib/lp/bugs/stories/bugattachments/40-search-bug-attachments.txt 2009-08-28 14:31:15 +0000
@@ -10,7 +10,7 @@
10 >>> user_browser.getControl("Description").value = "Some information."10 >>> user_browser.getControl("Description").value = "Some information."
11 >>> user_browser.getControl(11 >>> user_browser.getControl(
12 ... name="field.comment").value = "Added some information."12 ... name="field.comment").value = "Added some information."
13 >>> user_browser.getControl("Post comment").click()13 >>> user_browser.getControl("Post Comment").click()
1414
15And a patch...15And a patch...
1616
@@ -24,7 +24,7 @@
24 >>> user_browser.getControl("Description").value = "A patch."24 >>> user_browser.getControl("Description").value = "A patch."
25 >>> user_browser.getControl(25 >>> user_browser.getControl(
26 ... name="field.comment").value = "This patch fixes the bug."26 ... name="field.comment").value = "This patch fixes the bug."
27 >>> user_browser.getControl("Post comment").click()27 >>> user_browser.getControl("Post Comment").click()
2828
29And another patch...29And another patch...
3030
@@ -37,7 +37,7 @@
37 >>> user_browser.getControl("Description").value = "A patch."37 >>> user_browser.getControl("Description").value = "A patch."
38 >>> user_browser.getControl(38 >>> user_browser.getControl(
39 ... name="field.comment").value = "This patch fixes the bug."39 ... name="field.comment").value = "This patch fixes the bug."
40 >>> user_browser.getControl("Post comment").click()40 >>> user_browser.getControl("Post Comment").click()
4141
42And now we'll search for patches for firefox bugs.42And now we'll search for patches for firefox bugs.
4343
4444
=== modified file 'lib/lp/bugs/stories/bugattachments/xx-delete-bug-attachment.txt'
--- lib/lp/bugs/stories/bugattachments/xx-delete-bug-attachment.txt 2009-08-06 14:55:50 +0000
+++ lib/lp/bugs/stories/bugattachments/xx-delete-bug-attachment.txt 2009-08-28 14:31:15 +0000
@@ -10,7 +10,7 @@
10 >>> user_browser.getControl('Attachment').add_file(10 >>> user_browser.getControl('Attachment').add_file(
11 ... foo_file, 'text/plain', 'foo.txt')11 ... foo_file, 'text/plain', 'foo.txt')
12 >>> user_browser.getControl('Description').value = 'Great deal'12 >>> user_browser.getControl('Description').value = 'Great deal'
13 >>> user_browser.getControl('Post comment').click()13 >>> user_browser.getControl('Post Comment').click()
1414
15The attachment is now visible on the bug page.15The attachment is now visible on the bug page.
1616
1717
=== modified file 'lib/lp/bugs/stories/bugattachments/xx-display-filesize-attachment.txt'
--- lib/lp/bugs/stories/bugattachments/xx-display-filesize-attachment.txt 2009-08-07 08:56:22 +0000
+++ lib/lp/bugs/stories/bugattachments/xx-display-filesize-attachment.txt 2009-08-28 14:31:15 +0000
@@ -13,7 +13,7 @@
13 ... foo_file, "text/plain", "foo.txt")13 ... foo_file, "text/plain", "foo.txt")
14 >>> user_browser.getControl("Description").value = "description text"14 >>> user_browser.getControl("Description").value = "description text"
15 >>> user_browser.getControl(name="field.comment").value = "comment comment"15 >>> user_browser.getControl(name="field.comment").value = "comment comment"
16 >>> user_browser.getControl("Post comment").click()16 >>> user_browser.getControl("Post Comment").click()
17 >>> user_browser.url17 >>> user_browser.url
18 'http://bugs.launchpad.dev/firefox/+bug/1'18 'http://bugs.launchpad.dev/firefox/+bug/1'
1919
@@ -44,7 +44,7 @@
44 ... foo_file, "text/plain", "foo.txt")44 ... foo_file, "text/plain", "foo.txt")
45 >>> user_browser.getControl("Description").value = "description text"45 >>> user_browser.getControl("Description").value = "description text"
46 >>> user_browser.getControl(name="field.comment").value = "comment comment"46 >>> user_browser.getControl(name="field.comment").value = "comment comment"
47 >>> user_browser.getControl("Post comment").click()47 >>> user_browser.getControl("Post Comment").click()
48 >>> user_browser.url48 >>> user_browser.url
49 'http://bugs.launchpad.dev/firefox/+bug/1'49 'http://bugs.launchpad.dev/firefox/+bug/1'
5050
5151
=== modified file 'lib/lp/bugs/stories/bugs/80-add-comment.txt'
--- lib/lp/bugs/stories/bugs/80-add-comment.txt 2009-08-06 13:51:38 +0000
+++ lib/lp/bugs/stories/bugs/80-add-comment.txt 2009-08-28 14:31:15 +0000
@@ -17,7 +17,7 @@
17 ... 'http://localhost/debian/+source/mozilla-firefox/+bug/2')17 ... 'http://localhost/debian/+source/mozilla-firefox/+bug/2')
18 >>> user_browser.getControl(name='field.comment').value = (18 >>> user_browser.getControl(name='field.comment').value = (
19 ... 'This is a test comment.')19 ... 'This is a test comment.')
20 >>> user_browser.getControl('Post comment', index=-1).click()20 >>> user_browser.getControl('Post Comment', index=-1).click()
2121
22 >>> user_browser.url22 >>> user_browser.url
23 'http://bugs.launchpad.dev/debian/+source/mozilla-firefox/+bug/2'23 'http://bugs.launchpad.dev/debian/+source/mozilla-firefox/+bug/2'
2424
=== modified file 'lib/lp/bugs/stories/bugs/xx-add-comment-distribution-no-current-release.txt'
--- lib/lp/bugs/stories/bugs/xx-add-comment-distribution-no-current-release.txt 2009-08-06 13:51:38 +0000
+++ lib/lp/bugs/stories/bugs/xx-add-comment-distribution-no-current-release.txt 2009-08-28 14:31:15 +0000
@@ -12,7 +12,7 @@
12 'http://bugs.launchpad.dev/gentoo/+bug/...'12 'http://bugs.launchpad.dev/gentoo/+bug/...'
1313
14 >>> user_browser.getControl(name='field.comment').value = 'A new comment.'14 >>> user_browser.getControl(name='field.comment').value = 'A new comment.'
15 >>> user_browser.getControl('Post comment', index=-1).click()15 >>> user_browser.getControl('Post Comment', index=-1).click()
1616
17 >>> for comment_div in find_tags_by_class(17 >>> for comment_div in find_tags_by_class(
18 ... user_browser.contents, 'boardCommentBody'):18 ... user_browser.contents, 'boardCommentBody'):
1919
=== modified file 'lib/lp/bugs/stories/bugs/xx-add-comment-with-bugwatch-and-cve.txt'
--- lib/lp/bugs/stories/bugs/xx-add-comment-with-bugwatch-and-cve.txt 2009-08-06 13:51:38 +0000
+++ lib/lp/bugs/stories/bugs/xx-add-comment-with-bugwatch-and-cve.txt 2009-08-28 14:31:15 +0000
@@ -11,7 +11,7 @@
11 ... described here http://some.bugzilla/show_bug.cgi?id=987611 ... described here http://some.bugzilla/show_bug.cgi?id=9876
12 ... See also CVE-1991-991112 ... See also CVE-1991-9911
13 ... ''')13 ... ''')
14 >>> user_browser.getControl('Post comment', index=-1).click()14 >>> user_browser.getControl('Post Comment', index=-1).click()
1515
16 >>> user_browser.url16 >>> user_browser.url
17 'http://bugs.launchpad.dev/debian/+source/mozilla-firefox/+bug/1'17 'http://bugs.launchpad.dev/debian/+source/mozilla-firefox/+bug/1'
@@ -40,7 +40,7 @@
40 ... u'\xabhttps://answers.launchpad.net/ubuntu\xbb is not a linked bug '40 ... u'\xabhttps://answers.launchpad.net/ubuntu\xbb is not a linked bug '
41 ... u'but https://bugzilla.example.org/show_bug.cgi?id=1235555 '41 ... u'but https://bugzilla.example.org/show_bug.cgi?id=1235555 '
42 ... u'is.'.encode('utf-8'))42 ... u'is.'.encode('utf-8'))
43 >>> user_browser.getControl('Post comment', index=-1).click()43 >>> user_browser.getControl('Post Comment', index=-1).click()
44 >>> user_browser.url44 >>> user_browser.url
45 'http://bugs.launchpad.dev/debian/+source/mozilla-firefox/+bug/1'45 'http://bugs.launchpad.dev/debian/+source/mozilla-firefox/+bug/1'
4646
4747
=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-activity.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-activity.txt 2009-08-27 08:32:39 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-activity.txt 2009-08-28 14:31:15 +0000
@@ -53,7 +53,7 @@
53 ... 'http://bugs.launchpad.dev/redfish/+bug/15/+addcomment')53 ... 'http://bugs.launchpad.dev/redfish/+bug/15/+addcomment')
54 >>> user_browser.getControl(name='field.comment').value = (54 >>> user_browser.getControl(name='field.comment').value = (
55 ... "Here's a comment for testing, like.")55 ... "Here's a comment for testing, like.")
56 >>> user_browser.getControl('Post comment').click()56 >>> user_browser.getControl('Post Comment').click()
57 >>> print_comments(user_browser.contents)57 >>> print_comments(user_browser.contents)
58 Bug Watch Updater58 Bug Watch Updater
59 on 2007-12-1859 on 2007-12-18
6060
=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-comment-attach-file.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-comment-attach-file.txt 2009-08-07 08:56:22 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-comment-attach-file.txt 2009-08-28 14:31:15 +0000
@@ -15,7 +15,7 @@
15 >>> user_browser.open(15 >>> user_browser.open(
16 ... "http://bugs.launchpad.dev/firefox/+bug/1/+addcomment-form")16 ... "http://bugs.launchpad.dev/firefox/+bug/1/+addcomment-form")
17 >>> user_browser.getControl(name='field.comment').value = "a test comment"17 >>> user_browser.getControl(name='field.comment').value = "a test comment"
18 >>> user_browser.getControl("Post comment").click()18 >>> user_browser.getControl("Post Comment").click()
1919
20 >>> print user_browser.url20 >>> print user_browser.url
21 http://bugs.launchpad.dev/firefox/+bug/121 http://bugs.launchpad.dev/firefox/+bug/1
@@ -31,7 +31,7 @@
31 ... "http://bugs.launchpad.dev/firefox/+bug/1/+addcomment-form")31 ... "http://bugs.launchpad.dev/firefox/+bug/1/+addcomment-form")
32 >>> user_browser.getControl("Attachment").add_file(32 >>> user_browser.getControl("Attachment").add_file(
33 ... StringIO("a test file"), "text/plain", "foo.txt")33 ... StringIO("a test file"), "text/plain", "foo.txt")
34 >>> user_browser.getControl("Post comment").click()34 >>> user_browser.getControl("Post Comment").click()
3535
36 >>> get_feedback_messages(user_browser.contents)36 >>> get_feedback_messages(user_browser.contents)
37 [u'Attachment foo.txt added to bug.']37 [u'Attachment foo.txt added to bug.']
@@ -45,7 +45,7 @@
45 >>> user_browser.getControl("Attachment").add_file(45 >>> user_browser.getControl("Attachment").add_file(
46 ... StringIO("some file"), "text/plain", "bar.txt")46 ... StringIO("some file"), "text/plain", "bar.txt")
47 >>> user_browser.getControl("Description").value = "some file"47 >>> user_browser.getControl("Description").value = "some file"
48 >>> user_browser.getControl("Post comment").click()48 >>> user_browser.getControl("Post Comment").click()
4949
50 >>> print user_browser.url50 >>> print user_browser.url
51 http://bugs.launchpad.dev/firefox/+bug/151 http://bugs.launchpad.dev/firefox/+bug/1
@@ -59,7 +59,7 @@
59 ... "http://bugs.launchpad.dev/firefox/+bug/1/+addcomment-form")59 ... "http://bugs.launchpad.dev/firefox/+bug/1/+addcomment-form")
60 >>> user_browser.getControl("Attachment").add_file(60 >>> user_browser.getControl("Attachment").add_file(
61 ... StringIO(""), "text/plain", "foo.txt")61 ... StringIO(""), "text/plain", "foo.txt")
62 >>> user_browser.getControl("Post comment").click()62 >>> user_browser.getControl("Post Comment").click()
6363
64 >>> print user_browser.url64 >>> print user_browser.url
65 http://bugs.launchpad.dev/firefox/+bug/1/+addcomment65 http://bugs.launchpad.dev/firefox/+bug/1/+addcomment
@@ -81,7 +81,7 @@
81 ... "http://bugs.launchpad.dev/firefox/+bug/1/+addcomment-form")81 ... "http://bugs.launchpad.dev/firefox/+bug/1/+addcomment-form")
82 >>> user_browser.getControl("Attachment").add_file(82 >>> user_browser.getControl("Attachment").add_file(
83 ... StringIO("x"*1025), "text/plain", "foo.txt")83 ... StringIO("x"*1025), "text/plain", "foo.txt")
84 >>> user_browser.getControl("Post comment").click()84 >>> user_browser.getControl("Post Comment").click()
8585
86 >>> for msg in get_feedback_messages(user_browser.contents):86 >>> for msg in get_feedback_messages(user_browser.contents):
87 ... print msg87 ... print msg
@@ -95,7 +95,7 @@
95 >>> user_browser.getControl("Attachment").add_file(95 >>> user_browser.getControl("Attachment").add_file(
96 ... StringIO("a test file"), "text/plain", "foo.txt")96 ... StringIO("a test file"), "text/plain", "foo.txt")
97 >>> user_browser.getControl("Description").value = "some file"97 >>> user_browser.getControl("Description").value = "some file"
98 >>> user_browser.getControl("Post comment").click()98 >>> user_browser.getControl("Post Comment").click()
9999
100 >>> print user_browser.url100 >>> print user_browser.url
101 http://bugs.launchpad.dev/firefox/+bug/1101 http://bugs.launchpad.dev/firefox/+bug/1
102102
=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-comments-truncated.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-comments-truncated.txt 2009-08-06 13:51:38 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-comments-truncated.txt 2009-08-28 14:31:15 +0000
@@ -107,7 +107,7 @@
107 ... "T2PIWy0CUJsX8RXSt/M51WE=\n"107 ... "T2PIWy0CUJsX8RXSt/M51WE=\n"
108 ... "=J2S5\n"108 ... "=J2S5\n"
109 ... "-----END PGP SIGNATURE-----\n")109 ... "-----END PGP SIGNATURE-----\n")
110 >>> user_browser.getControl('Post comment', index=-1).click()110 >>> user_browser.getControl('Post Comment', index=-1).click()
111111
112No Privileges Person is authenticated in user_browser, so he can see112No Privileges Person is authenticated in user_browser, so he can see
113email addresses in messages.113email addresses in messages.
114114
=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-hidden-comments.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-hidden-comments.txt 2009-08-06 13:51:38 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-hidden-comments.txt 2009-08-28 14:31:15 +0000
@@ -9,7 +9,7 @@
9 ... '/jokosher/+bug/11')9 ... '/jokosher/+bug/11')
10 >>> user_browser.getControl(name='field.comment').value = (10 >>> user_browser.getControl(name='field.comment').value = (
11 ... 'This comment will not visible when the test completes.')11 ... 'This comment will not visible when the test completes.')
12 >>> user_browser.getControl('Post comment', index=-1).click()12 >>> user_browser.getControl('Post Comment', index=-1).click()
13 >>> main_content = find_main_content(user_browser.contents)13 >>> main_content = find_main_content(user_browser.contents)
14 >>> new_comment = main_content('div', 'boardCommentBody')[-1]14 >>> new_comment = main_content('div', 'boardCommentBody')[-1]
15 >>> new_comment_text = extract_text(new_comment.div)15 >>> new_comment_text = extract_text(new_comment.div)
1616
=== modified file 'lib/lp/bugs/stories/bugs/xx-incomplete-bugs.txt'
--- lib/lp/bugs/stories/bugs/xx-incomplete-bugs.txt 2009-08-06 13:51:38 +0000
+++ lib/lp/bugs/stories/bugs/xx-incomplete-bugs.txt 2009-08-28 14:31:15 +0000
@@ -49,7 +49,7 @@
49 >>> user_browser.open('http://bugs.launchpad.dev/jokosher/+bug/11')49 >>> user_browser.open('http://bugs.launchpad.dev/jokosher/+bug/11')
50 >>> user_browser.getControl(name='field.comment').value = (50 >>> user_browser.getControl(name='field.comment').value = (
51 ... 'More information here.')51 ... 'More information here.')
52 >>> user_browser.getControl('Post comment').click()52 >>> user_browser.getControl('Post Comment').click()
5353
54 >>> import transaction54 >>> import transaction
55 >>> transaction.commit()55 >>> transaction.commit()
@@ -188,7 +188,7 @@
188188
189 >>> user_browser.getLink('Make Jokosher use autoaudiosink').click()189 >>> user_browser.getLink('Make Jokosher use autoaudiosink').click()
190 >>> user_browser.getControl(name='field.comment').value = "bump"190 >>> user_browser.getControl(name='field.comment').value = "bump"
191 >>> user_browser.getControl('Post comment').click()191 >>> user_browser.getControl('Post Comment').click()
192 >>> user_browser.getLink('Bugs').click()192 >>> user_browser.getLink('Bugs').click()
193 >>> user_browser.getLink('incomplete bugs can expire').click()193 >>> user_browser.getLink('incomplete bugs can expire').click()
194 >>> contents = find_main_content(user_browser.contents)194 >>> contents = find_main_content(user_browser.contents)