opendev/gerrit
Code Issues Proposed changes

Merge "Add resolvable comments checkbox"

Browse Source
This commit is contained in:
Wyatt Allen
2017-01-11 22:52:22 +00:00
committed by Gerrit Code Review
parent 82db2cea51 06c374d500
commit 0624cbe482
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
polygerrit-ui/app/elements/diff/gr-diff-comment/gr-diff-comment.html
View File

@@ -240,6 +240,12 @@ limitations under the License.
disabled$="[[_computeSaveDisabled(_messageText)]]">Save</gr-button>
<gr-button class="action cancel hideOnPublished"
on-tap="_handleCancel" hidden>Cancel</gr-button>
<div class="action resolve hideOnPublished">
<input type="checkbox"
checked$="[[resolved]]"
on-change="_handleToggleResolved">
<label>Resolved</label>
</div>
<div class="danger">
<gr-button class="action discard hideOnPublished"
on-tap="_handleDiscard">Discard</gr-button>

18
polygerrit-ui/app/elements/diff/gr-diff-comment/gr-diff-comment_test.html
View File

@@ -288,6 +288,8 @@ limitations under the License.
assert.isFalse(isVisible(element.$$('.quote')), 'quote is not visible');
assert.isFalse(isVisible(element.$$('.ack')), 'ack is not visible');
assert.isFalse(isVisible(element.$$('.done')), 'done is not visible');
assert.isFalse(isVisible(element.$$('.resolve')),
'resolve is not visible');
assert.isFalse(element.$$('.humanActions').hasAttribute('hidden'));
assert.isTrue(element.$$('.robotActions').hasAttribute('hidden'));
@@ -300,6 +302,7 @@ limitations under the License.
assert.isFalse(isVisible(element.$$('.quote')), 'quote is not visible');
assert.isFalse(isVisible(element.$$('.ack')), 'ack is not visible');
assert.isFalse(isVisible(element.$$('.done')), 'done is not visible');
assert.isTrue(isVisible(element.$$('.resolve')), 'resolve is visible');
assert.isFalse(element.$$('.humanActions').hasAttribute('hidden'));
assert.isTrue(element.$$('.robotActions').hasAttribute('hidden'));
@@ -532,5 +535,20 @@ limitations under the License.
'Should navigate to ' + dest + ' without triggering nav');
showStub.restore();
});
test('proper event fires on resolve', function(done) {
element.addEventListener('comment-update', function(e) {
assert.isTrue(e.detail.comment.unresolved);
done();
});
MockInteractions.tap(element.$$('.resolve input'));
});
test('resolved comment state indicated by checkbox', function() {
element.comment = {unresolved: false};
assert.isTrue(element.$$('.resolve input').checked);
element.comment = {unresolved: true};
assert.isFalse(element.$$('.resolve input').checked);
});
});
</script>