Merge lp:~wallyworld/launchpad/update-dupe-comment-597971 into lp:launchpad

[Ian Booth]

Ensure the bug dupe warning comment is always updated correctly.

== Implementation ==

A quick fix to ensure the bug dupe warning comment is updated correctly.

== Tests ==

Update an existing yui test

== Lint ==

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/bugs/javascript/duplicates.js
  lib/lp/bugs/javascript/tests/test_duplicates.js

[Ian Booth (wallyworld)]

Trivial change, self review

review: Approve

=== modified file 'lib/lp/bugs/javascript/duplicates.js'
--- lib/lp/bugs/javascript/duplicates.js	2012-08-06 11:19:31 +0000
+++ lib/lp/bugs/javascript/duplicates.js	2012-08-07 23:15:28 +0000
@@ -280,23 +280,25 @@
      * @private
      */
     _show_comment_on_duplicate_warning: function(bug_id, title) {
+        var dupe_link = Y.Lang.substitute(
+            '<a title="{title}" id="duplicate-of-warning-link" ' +
+            'href="/bugs/{id}" style="margin-right: 4px">bug #{id}.</a>',
+            {id: bug_id, title: title});
+        var new_duplicate_warning = Y.Node.create(
+            ['<div class="block-sprite large-warning"',
+             'id="warning-comment-on-duplicate">',
+             'Remember, this bug report is a duplicate of ',
+             dupe_link,
+             '<br>Comment here only if you think the duplicate status ',
+             'is wrong.',
+             '</div>'].join(''));
         var duplicate_warning = Y.one('#warning-comment-on-duplicate');
         if (!Y.Lang.isValue(duplicate_warning)) {
             var container = Y.one('#add-comment-form');
             var first_node = container.get('firstChild');
-            var dupe_link = Y.Lang.substitute(
-                '<a title="{title}" id="duplicate-of-warning-link" ' +
-                'href="/bugs/{id}" style="margin-right: 4px">bug #{id}.</a>',
-                {id: bug_id, title: title});
-            duplicate_warning = Y.Node.create(
-                ['<div class="block-sprite large-warning"',
-                 'id="warning-comment-on-duplicate">',
-                 'Remember, this bug report is a duplicate of ',
-                 dupe_link,
-                 '<br>Comment here only if you think the duplicate status ',
-                 'is wrong.',
-                 '</div>'].join(''));
-            container.insertBefore(duplicate_warning, first_node);
+            container.insertBefore(new_duplicate_warning, first_node);
+        } else {
+            duplicate_warning.replace(new_duplicate_warning);
         }
     },
 

=== modified file 'lib/lp/bugs/javascript/tests/test_duplicates.html'
--- lib/lp/bugs/javascript/tests/test_duplicates.html	2012-08-03 12:47:11 +0000
+++ lib/lp/bugs/javascript/tests/test_duplicates.html	2012-08-07 23:15:28 +0000
@@ -74,6 +74,7 @@
                 </li>
             </ul></div>
             <div id="duplicate-form-container"></div>
+            <div id="warning-comment-on-duplicate"></div>
             <div id="add-comment-form"></div>
             <div id="portlet-duplicates"></div>
         </script>
@@ -92,6 +93,7 @@
                 </li>
             </ul></div>
             <div id="duplicate-form-container"></div>
+            <div id="warning-comment-on-duplicate"></div>
             <div id="add-comment-form"></div>
         </script>
     </body>

=== modified file 'lib/lp/bugs/javascript/tests/test_duplicates.js'
--- lib/lp/bugs/javascript/tests/test_duplicates.js	2012-08-06 02:54:11 +0000
+++ lib/lp/bugs/javascript/tests/test_duplicates.js	2012-08-07 23:15:28 +0000
@@ -238,7 +238,13 @@
             // Test the Change Duplicate link.
             Y.Assert.isNotNull(Y.one('#mark-duplicate-text a'));
             // Test the duplicate warning message.
-            Y.Assert.isNotNull(Y.one('#warning-comment-on-duplicate'));
+            var dupe_warning = Y.one('#warning-comment-on-duplicate');
+            Y.Assert.isNotNull(dupe_warning);
+            Y.Assert.areEqual(
+                'Remember, this bug report is a duplicate of bug #3.' +
+                'Comment here only if you think the duplicate status ' +
+                'is wrong.',
+                dupe_warning.get('text').trim());
             // Any previously listed duplicates are removed.
             Y.Assert.isNull(Y.one('#portlet-duplicates'));
         },