opendev/gerrit
Code Issues Proposed changes

ES6ify /gr-diff-comment/*

Browse Source 
Bug: Issue 6179
Change-Id: Id103711e6a7ca24785a301dbb8341bb0c8f63617
This commit is contained in:
Kasper Nilsson
2017-05-16 13:50:27 -07:00
parent 4837b37638
commit a4c24de33c
2 changed files with 154 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

163
polygerrit-ui/app/elements/diff/gr-diff-comment/gr-diff-comment.js
View File

@@ -14,7 +14,7 @@
(function() { (function() {
'use strict'; 'use strict';
var STORAGE_DEBOUNCE_INTERVAL = 400; const STORAGE_DEBOUNCE_INTERVAL = 400;
Polymer({ Polymer({
is: 'gr-diff-comment', is: 'gr-diff-comment',
@@ -116,55 +116,55 @@
'_calculateActionstoShow(showActions, isRobotComment)', '_calculateActionstoShow(showActions, isRobotComment)',
], ],
attached: function() { attached() {
if (this.editing) { if (this.editing) {
this.collapsed = false; this.collapsed = false;
} else if (this.comment) { } else if (this.comment) {
this.collapsed = this.comment.collapsed; this.collapsed = this.comment.collapsed;
} }
this._getIsAdmin().then(function(isAdmin) { this._getIsAdmin().then(isAdmin => {
this._isAdmin = isAdmin; this._isAdmin = isAdmin;
}.bind(this)); });
}, },
detached: function() { detached() {
this.cancelDebouncer('fire-update'); this.cancelDebouncer('fire-update');
}, },
_computeShowHideText: function(collapsed) { _computeShowHideText(collapsed) {
return collapsed ? '◀' : '▼'; return collapsed ? '◀' : '▼';
}, },
_calculateActionstoShow: function(showActions, isRobotComment) { _calculateActionstoShow(showActions, isRobotComment) {
this._showHumanActions = showActions && !isRobotComment; this._showHumanActions = showActions && !isRobotComment;
this._showRobotActions = showActions && isRobotComment; this._showRobotActions = showActions && isRobotComment;
}, },
_isRobotComment: function(comment) { _isRobotComment(comment) {
this.isRobotComment = !!comment.robot_id; this.isRobotComment = !!comment.robot_id;
}, },
isOnParent: function() { isOnParent() {
return this.side === 'PARENT'; return this.side === 'PARENT';
}, },
_getIsAdmin: function() { _getIsAdmin() {
return this.$.restAPI.getIsAdmin(); return this.$.restAPI.getIsAdmin();
}, },
save: function() { save() {
this.comment.message = this._messageText; this.comment.message = this._messageText;
this.disabled = true; this.disabled = true;
this._eraseDraftComment(); this._eraseDraftComment();
this._xhrPromise = this._saveDraft(this.comment).then(function(response) { this._xhrPromise = this._saveDraft(this.comment).then(response => {
this.disabled = false; this.disabled = false;
if (!response.ok) { return response; } if (!response.ok) { return response; }
return this.$.restAPI.getResponseObject(response).then(function(obj) { return this.$.restAPI.getResponseObject(response).then(obj => {
var comment = obj; const comment = obj;
comment.__draft = true; comment.__draft = true;
// Maintain the ephemeral draft ID for identification by other // Maintain the ephemeral draft ID for identification by other
// elements. // elements.
@@ -176,17 +176,18 @@
this.editing = false; this.editing = false;
this._fireSave(); this._fireSave();
return obj; return obj;
}.bind(this)); });
}.bind(this)).catch(function(err) { }).catch(err => {
this.disabled = false; this.disabled = false;
throw err; throw err;
}.bind(this)); });
}, },
_eraseDraftComment: function() { _eraseDraftComment() {
// Prevents a race condition in which removing the draft comment occurs // Prevents a race condition in which removing the draft comment occurs
// prior to it being saved. // prior to it being saved.
this.cancelDebouncer('store'); this.cancelDebouncer('store');
this.$.storage.eraseDraftComment({ this.$.storage.eraseDraftComment({
changeNum: this.changeNum, changeNum: this.changeNum,
patchNum: this._getPatchNum(), patchNum: this._getPatchNum(),
@@ -196,7 +197,7 @@
}); });
}, },
_commentChanged: function(comment) { _commentChanged(comment) {
this.editing = !!comment.__editing; this.editing = !!comment.__editing;
this.resolved = !comment.unresolved; this.resolved = !comment.unresolved;
if (this.editing) { // It's a new draft/reply, notify. if (this.editing) { // It's a new draft/reply, notify.
@@ -204,41 +205,37 @@
} }
}, },
_getEventPayload: function(opt_mixin) { _getEventPayload(opt_mixin) {
var payload = { return Object.assign({}, opt_mixin, {
comment: this.comment, comment: this.comment,
patchNum: this.patchNum, patchNum: this.patchNum,
}; });
for (var k in opt_mixin) {
payload[k] = opt_mixin[k];
}
return payload;
}, },
_fireSave: function() { _fireSave() {
this.fire('comment-save', this._getEventPayload()); this.fire('comment-save', this._getEventPayload());
}, },
_fireUpdate: function() { _fireUpdate() {
this.debounce('fire-update', function() { this.debounce('fire-update', () => {
this.fire('comment-update', this._getEventPayload()); this.fire('comment-update', this._getEventPayload());
}); });
}, },
_draftChanged: function(draft) { _draftChanged(draft) {
this.$.container.classList.toggle('draft', draft); this.$.container.classList.toggle('draft', draft);
}, },
_editingChanged: function(editing, previousValue) { _editingChanged(editing, previousValue) {
this.$.container.classList.toggle('editing', editing); this.$.container.classList.toggle('editing', editing);
if (editing) { if (editing) {
var textarea = this.$.editTextarea.textarea; const textarea = this.$.editTextarea.textarea;
// Put the cursor at the end always. // Put the cursor at the end always.
textarea.selectionStart = textarea.value.length; textarea.selectionStart = textarea.value.length;
textarea.selectionEnd = textarea.selectionStart; textarea.selectionEnd = textarea.selectionStart;
this.async(function() { this.async(() => {
textarea.focus(); textarea.focus();
}.bind(this)); });
} }
if (this.comment && this.comment.id) { if (this.comment && this.comment.id) {
this.$$('.cancel').hidden = !editing; this.$$('.cancel').hidden = !editing;
@@ -252,15 +249,15 @@
} }
}, },
_computeLinkToComment: function(comment) { _computeLinkToComment(comment) {
return '#' + comment.line; return '#' + comment.line;
}, },
_computeSaveDisabled: function(draft) { _computeSaveDisabled(draft) {
return draft == null || draft.trim() == ''; return draft == null || draft.trim() == '';
}, },
_handleTextareaKeydown: function(e) { _handleTextareaKeydown(e) {
switch (e.keyCode) { switch (e.keyCode) {
case 13: // 'enter' case 13: // 'enter'
if (this._messageText.length !== 0 && (e.metaKey || e.ctrlKey)) { if (this._messageText.length !== 0 && (e.metaKey || e.ctrlKey)) {
@@ -280,11 +277,11 @@
} }
}, },
_handleToggleCollapsed: function() { _handleToggleCollapsed() {
this.collapsed = !this.collapsed; this.collapsed = !this.collapsed;
}, },
_toggleCollapseClass: function(collapsed) { _toggleCollapseClass(collapsed) {
if (collapsed) { if (collapsed) {
this.$.container.classList.add('collapsed'); this.$.container.classList.add('collapsed');
} else { } else {
@@ -292,20 +289,20 @@
} }
}, },
_commentMessageChanged: function(message) { _commentMessageChanged(message) {
this._messageText = message || ''; this._messageText = message || '';
}, },
_messageTextChanged: function(newValue, oldValue) { _messageTextChanged(newValue, oldValue) {
if (!this.comment || (this.comment && this.comment.id)) { return; } if (!this.comment || (this.comment && this.comment.id)) { return; }
// Keep comment.message in sync so that gr-diff-comment-thread is aware // Keep comment.message in sync so that gr-diff-comment-thread is aware
// of the current message in the case that another comment is deleted. // of the current message in the case that another comment is deleted.
this.comment.message = this._messageText || ''; this.comment.message = this._messageText || '';
this.debounce('store', function() { this.debounce('store', () => {
var message = this._messageText; const message = this._messageText;
var commentLocation = { const commentLocation = {
changeNum: this.changeNum, changeNum: this.changeNum,
patchNum: this._getPatchNum(), patchNum: this._getPatchNum(),
path: this.comment.path, path: this.comment.path,
@@ -324,9 +321,9 @@
}, STORAGE_DEBOUNCE_INTERVAL); }, STORAGE_DEBOUNCE_INTERVAL);
}, },
_handleLinkTap: function(e) { _handleLinkTap(e) {
e.preventDefault(); e.preventDefault();
var hash = this._computeLinkToComment(this.comment); const hash = this._computeLinkToComment(this.comment);
// Don't add the hash to the window history if it's already there. // Don't add the hash to the window history if it's already there.
// Otherwise you mess up expected back button behavior. // Otherwise you mess up expected back button behavior.
if (window.location.hash == hash) { return; } if (window.location.hash == hash) { return; }
@@ -335,52 +332,51 @@
page.show(window.location.pathname + hash, null, false); page.show(window.location.pathname + hash, null, false);
}, },
_handleReply: function(e) { _handleReply(e) {
e.preventDefault(); e.preventDefault();
this.fire('create-reply-comment', this._getEventPayload(), this.fire('create-reply-comment', this._getEventPayload(),
{bubbles: false}); {bubbles: false});
}, },
_handleQuote: function(e) { _handleQuote(e) {
e.preventDefault(); e.preventDefault();
this.fire('create-reply-comment', this._getEventPayload({quote: true}), this.fire('create-reply-comment', this._getEventPayload({quote: true}),
{bubbles: false}); {bubbles: false});
}, },
_handleFix: function(e) { _handleFix(e) {
e.preventDefault(); e.preventDefault();
this.fire('create-fix-comment', this._getEventPayload({quote: true}), this.fire('create-fix-comment', this._getEventPayload({quote: true}),
{bubbles: false}); {bubbles: false});
}, },
_handleAck: function(e) { _handleAck(e) {
e.preventDefault(); e.preventDefault();
this.fire('create-ack-comment', this._getEventPayload(), this.fire('create-ack-comment', this._getEventPayload(),
{bubbles: false}); {bubbles: false});
}, },
_handleDone: function(e) { _handleDone(e) {
e.preventDefault(); e.preventDefault();
this.fire('create-done-comment', this._getEventPayload(), this.fire('create-done-comment', this._getEventPayload(),
{bubbles: false}); {bubbles: false});
}, },
_handleEdit: function(e) { _handleEdit(e) {
e.preventDefault(); e.preventDefault();
this._messageText = this.comment.message; this._messageText = this.comment.message;
this.editing = true; this.editing = true;
}, },
_handleSave: function(e) { _handleSave(e) {
e.preventDefault(); e.preventDefault();
this.set('comment.__editing', false); this.set('comment.__editing', false);
this.save(); this.save();
}, },
_handleCancel: function(e) { _handleCancel(e) {
e.preventDefault(); e.preventDefault();
if (!this.comment.message || if (!this.comment.message || this.comment.message.trim().length === 0) {
this.comment.message.trim().length === 0) {
this._fireDiscard(); this._fireDiscard();
return; return;
} }
@@ -388,12 +384,12 @@
this.editing = false; this.editing = false;
}, },
_fireDiscard: function() { _fireDiscard() {
this.cancelDebouncer('fire-update'); this.cancelDebouncer('fire-update');
this.fire('comment-discard', this._getEventPayload()); this.fire('comment-discard', this._getEventPayload());
}, },
_handleDiscard: function(e) { _handleDiscard(e) {
e.preventDefault(); e.preventDefault();
if (!this.comment.__draft) { if (!this.comment.__draft) {
throw Error('Cannot discard a non-draft comment.'); throw Error('Cannot discard a non-draft comment.');
@@ -408,32 +404,31 @@
return; return;
} }
this._xhrPromise = this._deleteDraft(this.comment).then( this._xhrPromise = this._deleteDraft(this.comment).then(response => {
function(response) { this.disabled = false;
this.disabled = false; if (!response.ok) { return response; }
if (!response.ok) { return response; }
this._fireDiscard(); this._fireDiscard();
}.bind(this)).catch(function(err) { }).catch(err => {
this.disabled = false; this.disabled = false;
throw err; throw err;
}.bind(this)); });
}, },
_saveDraft: function(draft) { _saveDraft(draft) {
return this.$.restAPI.saveDiffDraft(this.changeNum, this.patchNum, draft); return this.$.restAPI.saveDiffDraft(this.changeNum, this.patchNum, draft);
}, },
_deleteDraft: function(draft) { _deleteDraft(draft) {
return this.$.restAPI.deleteDiffDraft(this.changeNum, this.patchNum, return this.$.restAPI.deleteDiffDraft(this.changeNum, this.patchNum,
draft); draft);
}, },
_getPatchNum: function() { _getPatchNum() {
return this.isOnParent() ? 'PARENT' : this.patchNum; return this.isOnParent() ? 'PARENT' : this.patchNum;
}, },
_loadLocalDraft: function(changeNum, patchNum, comment) { _loadLocalDraft(changeNum, patchNum, comment) {
// Only apply local drafts to comments that haven't been saved // Only apply local drafts to comments that haven't been saved
// remotely, and haven't been given a default message already. // remotely, and haven't been given a default message already.
// //
@@ -444,8 +439,8 @@
return; return;
} }
var draft = this.$.storage.getDraftComment({ const draft = this.$.storage.getDraftComment({
changeNum: changeNum, changeNum,
patchNum: this._getPatchNum(), patchNum: this._getPatchNum(),
path: comment.path, path: comment.path,
line: comment.line, line: comment.line,
@@ -457,40 +452,40 @@
} }
}, },
_handleMouseEnter: function(e) { _handleMouseEnter(e) {
this.fire('comment-mouse-over', this._getEventPayload()); this.fire('comment-mouse-over', this._getEventPayload());
}, },
_handleMouseLeave: function(e) { _handleMouseLeave(e) {
this.fire('comment-mouse-out', this._getEventPayload()); this.fire('comment-mouse-out', this._getEventPayload());
}, },
_handleToggleResolved: function() { _handleToggleResolved() {
this.resolved = !this.resolved; this.resolved = !this.resolved;
}, },
_toggleResolved: function(resolved) { _toggleResolved(resolved) {
this.comment.unresolved = !resolved; this.comment.unresolved = !resolved;
this.fire('comment-update', this._getEventPayload()); this.fire('comment-update', this._getEventPayload());
}, },
_handleCommentDelete: function() { _handleCommentDelete() {
Polymer.dom(Gerrit.getRootElement()).appendChild(this.$.overlay); Polymer.dom(Gerrit.getRootElement()).appendChild(this.$.overlay);
this.$.overlay.open(); this.$.overlay.open();
}, },
_handleCancelDeleteComment: function() { _handleCancelDeleteComment() {
Polymer.dom(Gerrit.getRootElement()).removeChild(this.$.overlay); Polymer.dom(Gerrit.getRootElement()).removeChild(this.$.overlay);
this.$.overlay.close(); this.$.overlay.close();
}, },
_handleConfirmDeleteComment: function() { _handleConfirmDeleteComment() {
this.$.restAPI.deleteComment( this.$.restAPI.deleteComment(
this.changeNum, this.patchNum, this.comment.id, this.changeNum, this.patchNum, this.comment.id,
this.$.confirmDeleteComment.message).then(function(newComment) { this.$.confirmDeleteComment.message).then(newComment => {
this._handleCancelDeleteComment(); this._handleCancelDeleteComment();
this.comment = newComment; this.comment = newComment;
}.bind(this)); });
}, },
}); });
})(); })();

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

@@ -47,12 +47,12 @@ limitations under the License.
return getComputedStyle(el).getPropertyValue('display') !== 'none'; return getComputedStyle(el).getPropertyValue('display') !== 'none';
} }
suite('gr-diff-comment tests', function() { suite('gr-diff-comment tests', () => {
var element; let element;
var sandbox; let sandbox;
setup(function() { setup(() => {
stub('gr-rest-api-interface', { stub('gr-rest-api-interface', {
getAccount: function() { return Promise.resolve(null); }, getAccount() { return Promise.resolve(null); },
}); });
element = fixture('basic'); element = fixture('basic');
element.comment = { element.comment = {
@@ -68,11 +68,11 @@ limitations under the License.
sandbox = sinon.sandbox.create(); sandbox = sinon.sandbox.create();
}); });
teardown(function() { teardown(() => {
sandbox.restore(); sandbox.restore();
}); });
test('collapsible comments', function() { test('collapsible comments', () => {
// When a comment (not draft) is loaded, it should be collapsed // When a comment (not draft) is loaded, it should be collapsed
assert.isTrue(element.collapsed); assert.isTrue(element.collapsed);
assert.isFalse(isVisible(element.$$('gr-formatted-text')), assert.isFalse(isVisible(element.$$('gr-formatted-text')),
@@ -100,21 +100,20 @@ limitations under the License.
'header middle content is not visible'); 'header middle content is not visible');
}); });
test('clicking on date link does not trigger nav', function() { test('clicking on date link does not trigger nav', () => {
var showStub = sinon.stub(page, 'show'); const showStub = sinon.stub(page, 'show');
var dateEl = element.$$('.date'); const dateEl = element.$$('.date');
assert.ok(dateEl); assert.ok(dateEl);
MockInteractions.tap(dateEl); MockInteractions.tap(dateEl);
var dest = window.location.pathname + '#5'; const dest = window.location.pathname + '#5';
assert(showStub.lastCall.calledWithExactly(dest, null, false), assert(showStub.lastCall.calledWithExactly(dest, null, false),
'Should navigate to ' + dest + ' without triggering nav'); 'Should navigate to ' + dest + ' without triggering nav');
showStub.restore(); showStub.restore();
}); });
test('message is not retrieved from storage when other editing is true', test('message is not retrieved from storage when other edits', done => {
function(done) { const storageStub = sandbox.stub(element.$.storage, 'getDraftComment');
var storageStub = sandbox.stub(element.$.storage, 'getDraftComment'); const loadSpy = sandbox.spy(element, '_loadLocalDraft');
var loadSpy = sandbox.spy(element, '_loadLocalDraft');
element.changeNum = 1; element.changeNum = 1;
element.patchNum = 1; element.patchNum = 1;
@@ -126,17 +125,16 @@ limitations under the License.
line: 5, line: 5,
__otherEditing: true, __otherEditing: true,
}; };
flush(function() { flush(() => {
assert.isTrue(loadSpy.called); assert.isTrue(loadSpy.called);
assert.isFalse(storageStub.called); assert.isFalse(storageStub.called);
done(); done();
}); });
}); });
test('message is retrieved from storage when there is no other editing', test('message is retrieved from storage when no other edits', done => {
function(done) { const storageStub = sandbox.stub(element.$.storage, 'getDraftComment');
var storageStub = sandbox.stub(element.$.storage, 'getDraftComment'); const loadSpy = sandbox.spy(element, '_loadLocalDraft');
var loadSpy = sandbox.spy(element, '_loadLocalDraft');
element.changeNum = 1; element.changeNum = 1;
element.patchNum = 1; element.patchNum = 1;
@@ -147,14 +145,14 @@ limitations under the License.
}, },
line: 5, line: 5,
}; };
flush(function() { flush(() => {
assert.isTrue(loadSpy.called); assert.isTrue(loadSpy.called);
assert.isTrue(storageStub.called); assert.isTrue(storageStub.called);
done(); done();
}); });
}); });
test('_getPatchNum', function() { test('_getPatchNum', () => {
element.side = 'PARENT'; element.side = 'PARENT';
element.patchNum = 1; element.patchNum = 1;
assert.equal(element._getPatchNum(), 'PARENT'); assert.equal(element._getPatchNum(), 'PARENT');
@@ -162,7 +160,7 @@ limitations under the License.
assert.equal(element._getPatchNum(), 1); assert.equal(element._getPatchNum(), 1);
}); });
test('comment expand and collapse', function() { test('comment expand and collapse', () => {
element.collapsed = true; element.collapsed = true;
assert.isFalse(isVisible(element.$$('gr-formatted-text')), assert.isFalse(isVisible(element.$$('gr-formatted-text')),
'gr-formatted-text is not visible'); 'gr-formatted-text is not visible');
@@ -185,8 +183,8 @@ limitations under the License.
'header middle content is is not visible'); 'header middle content is is not visible');
}); });
suite('while editing', function() { suite('while editing', () => {
setup(function() { setup(() => {
element.editing = true; element.editing = true;
element._messageText = 'test'; element._messageText = 'test';
sandbox.stub(element, '_handleCancel'); sandbox.stub(element, '_handleCancel');
@@ -194,55 +192,55 @@ limitations under the License.
flushAsynchronousOperations(); flushAsynchronousOperations();
}); });
suite('when text is empty', function() { suite('when text is empty', () => {
setup(function() { setup(() => {
element._messageText = ''; element._messageText = '';
}); });
test('esc closes comment when text is empty', function() { test('esc closes comment when text is empty', () => {
MockInteractions.pressAndReleaseKeyOn( MockInteractions.pressAndReleaseKeyOn(
element.$.editTextarea, 27); // esc element.$.editTextarea, 27); // esc
assert.isTrue(element._handleCancel.called); assert.isTrue(element._handleCancel.called);
}); });
test('ctrl+enter does not save', function() { test('ctrl+enter does not save', () => {
MockInteractions.pressAndReleaseKeyOn( MockInteractions.pressAndReleaseKeyOn(
element.$.editTextarea, 13, 'ctrl'); // ctrl + enter element.$.editTextarea, 13, 'ctrl'); // ctrl + enter
assert.isFalse(element._handleSave.called); assert.isFalse(element._handleSave.called);
}); });
test('meta+enter does not save', function() { test('meta+enter does not save', () => {
MockInteractions.pressAndReleaseKeyOn( MockInteractions.pressAndReleaseKeyOn(
element.$.editTextarea, 13, 'meta'); // meta + enter element.$.editTextarea, 13, 'meta'); // meta + enter
assert.isFalse(element._handleSave.called); assert.isFalse(element._handleSave.called);
}); });
test('ctrl+s does not save', function() { test('ctrl+s does not save', () => {
MockInteractions.pressAndReleaseKeyOn( MockInteractions.pressAndReleaseKeyOn(
element.$.editTextarea, 83, 'ctrl'); // ctrl + s element.$.editTextarea, 83, 'ctrl'); // ctrl + s
assert.isFalse(element._handleSave.called); assert.isFalse(element._handleSave.called);
}); });
}); });
test('esc does not close comment that has content', function() { test('esc does not close comment that has content', () => {
MockInteractions.pressAndReleaseKeyOn( MockInteractions.pressAndReleaseKeyOn(
element.$.editTextarea, 27); // esc element.$.editTextarea, 27); // esc
assert.isFalse(element._handleCancel.called); assert.isFalse(element._handleCancel.called);
}); });
test('ctrl+enter saves', function() { test('ctrl+enter saves', () => {
MockInteractions.pressAndReleaseKeyOn( MockInteractions.pressAndReleaseKeyOn(
element.$.editTextarea, 13, 'ctrl'); // ctrl + enter element.$.editTextarea, 13, 'ctrl'); // ctrl + enter
assert.isTrue(element._handleSave.called); assert.isTrue(element._handleSave.called);
}); });
test('meta+enter saves', function() { test('meta+enter saves', () => {
MockInteractions.pressAndReleaseKeyOn( MockInteractions.pressAndReleaseKeyOn(
element.$.editTextarea, 13, 'meta'); // meta + enter element.$.editTextarea, 13, 'meta'); // meta + enter
assert.isTrue(element._handleSave.called); assert.isTrue(element._handleSave.called);
}); });
test('ctrl+s saves', function() { test('ctrl+s saves', () => {
MockInteractions.pressAndReleaseKeyOn( MockInteractions.pressAndReleaseKeyOn(
element.$.editTextarea, 83, 'ctrl'); // ctrl + s element.$.editTextarea, 83, 'ctrl'); // ctrl + s
assert.isTrue(element._handleSave.called); assert.isTrue(element._handleSave.called);
@@ -271,19 +269,19 @@ limitations under the License.
}); });
}); });
suite('gr-diff-comment draft tests', function() { suite('gr-diff-comment draft tests', () => {
var element; let element;
var sandbox; let sandbox;
setup(function() { setup(() => {
stub('gr-rest-api-interface', { stub('gr-rest-api-interface', {
getAccount: function() { return Promise.resolve(null); }, getAccount() { return Promise.resolve(null); },
saveDiffDraft: function() { saveDiffDraft() {
return Promise.resolve({ return Promise.resolve({
ok: true, ok: true,
text: function() { text() {
return Promise.resolve( return Promise.resolve(
')]}\'\n{' + ')]}\'\n{' +
'"id": "baf0414d_40572e03",' + '"id": "baf0414d_40572e03",' +
'"path": "/path/to/file",' + '"path": "/path/to/file",' +
'"line": 5,' + '"line": 5,' +
@@ -294,12 +292,12 @@ limitations under the License.
}, },
}); });
}, },
removeChangeReviewer: function() { removeChangeReviewer() {
return Promise.resolve({ok: true}); return Promise.resolve({ok: true});
}, },
}); });
stub('gr-storage', { stub('gr-storage', {
getDraftComment: function() { return null; }, getDraftComment() { return null; },
}); });
element = fixture('draft'); element = fixture('draft');
element.changeNum = 42; element.changeNum = 42;
@@ -316,11 +314,11 @@ limitations under the License.
sandbox = sinon.sandbox.create(); sandbox = sinon.sandbox.create();
}); });
teardown(function() { teardown(() => {
sandbox.restore(); sandbox.restore();
}); });
test('button visibility states', function() { test('button visibility states', () => {
element.showActions = false; element.showActions = false;
assert.isTrue(element.$$('.humanActions').hasAttribute('hidden')); assert.isTrue(element.$$('.humanActions').hasAttribute('hidden'));
assert.isTrue(element.$$('.robotActions').hasAttribute('hidden')); assert.isTrue(element.$$('.robotActions').hasAttribute('hidden'));
@@ -377,7 +375,7 @@ limitations under the License.
assert.isFalse(element.$$('.robotActions').hasAttribute('hidden')); assert.isFalse(element.$$('.robotActions').hasAttribute('hidden'));
}); });
test('collapsible drafts', function() { test('collapsible drafts', () => {
assert.isTrue(element.collapsed); assert.isTrue(element.collapsed);
assert.isFalse(isVisible(element.$$('gr-formatted-text')), assert.isFalse(isVisible(element.$$('gr-formatted-text')),
'gr-formatted-text is not visible'); 'gr-formatted-text is not visible');
@@ -438,26 +436,26 @@ limitations under the License.
'header middle content is not visible'); 'header middle content is not visible');
}); });
test('draft creation/cancelation', function(done) { test('draft creation/cancelation', done => {
assert.isFalse(element.editing); assert.isFalse(element.editing);
MockInteractions.tap(element.$$('.edit')); MockInteractions.tap(element.$$('.edit'));
assert.isTrue(element.editing); assert.isTrue(element.editing);
element._messageText = ''; element._messageText = '';
var eraseMessageDraftSpy = sandbox.spy(element, '_eraseDraftComment'); const eraseMessageDraftSpy = sandbox.spy(element, '_eraseDraftComment');
// Save should be disabled on an empty message. // Save should be disabled on an empty message.
var disabled = element.$$('.save').hasAttribute('disabled'); let disabled = element.$$('.save').hasAttribute('disabled');
assert.isTrue(disabled, 'save button should be disabled.'); assert.isTrue(disabled, 'save button should be disabled.');
element._messageText = ' '; element._messageText = ' ';
disabled = element.$$('.save').hasAttribute('disabled'); disabled = element.$$('.save').hasAttribute('disabled');
assert.isTrue(disabled, 'save button should be disabled.'); assert.isTrue(disabled, 'save button should be disabled.');
var updateStub = sinon.stub(); const updateStub = sinon.stub();
element.addEventListener('comment-update', updateStub); element.addEventListener('comment-update', updateStub);
var numDiscardEvents = 0; let numDiscardEvents = 0;
element.addEventListener('comment-discard', function(e) { element.addEventListener('comment-discard', e => {
numDiscardEvents++; numDiscardEvents++;
assert.isFalse(eraseMessageDraftSpy.called); assert.isFalse(eraseMessageDraftSpy.called);
if (numDiscardEvents === 2) { if (numDiscardEvents === 2) {
@@ -471,32 +469,31 @@ limitations under the License.
MockInteractions.pressAndReleaseKeyOn(element.$.editTextarea, 27); // esc MockInteractions.pressAndReleaseKeyOn(element.$.editTextarea, 27); // esc
}); });
test('draft discard removes message from storage', function(done) { test('draft discard removes message from storage', done => {
element._messageText = ''; element._messageText = '';
var eraseMessageDraftSpy = sandbox.spy(element, '_eraseDraftComment'); const eraseMessageDraftSpy = sandbox.spy(element, '_eraseDraftComment');
var numDiscardEvents = 0; element.addEventListener('comment-discard', e => {
element.addEventListener('comment-discard', function(e) {
assert.isTrue(eraseMessageDraftSpy.called); assert.isTrue(eraseMessageDraftSpy.called);
done(); done();
}); });
MockInteractions.tap(element.$$('.discard')); MockInteractions.tap(element.$$('.discard'));
}); });
test('ctrl+s saves comment', function(done) { test('ctrl+s saves comment', done => {
var stub = sinon.stub(element, 'save', function() { const stub = sinon.stub(element, 'save', () => {
assert.isTrue(stub.called); assert.isTrue(stub.called);
stub.restore(); stub.restore();
done(); done();
}); });
element._messageText = 'is that the horse from horsing around??'; element._messageText = 'is that the horse from horsing around??';
MockInteractions.pressAndReleaseKeyOn( MockInteractions.pressAndReleaseKeyOn(
element.$.editTextarea.textarea, element.$.editTextarea.textarea,
83, 'ctrl'); // 'ctrl + s' 83, 'ctrl'); // 'ctrl + s'
}); });
test('draft saving/editing', function(done) { test('draft saving/editing', done => {
var fireStub = sinon.stub(element, 'fire'); const fireStub = sinon.stub(element, 'fire');
let cancelDebounce = sandbox.stub(element, 'cancelDebouncer'); let cancelDebounce = sandbox.stub(element, 'cancelDebouncer');
element.draft = true; element.draft = true;
@@ -505,7 +502,7 @@ limitations under the License.
element.flushDebouncer('fire-update'); element.flushDebouncer('fire-update');
element.flushDebouncer('store'); element.flushDebouncer('store');
assert(fireStub.calledWith('comment-update'), assert(fireStub.calledWith('comment-update'),
'comment-update should be sent'); 'comment-update should be sent');
assert.deepEqual(fireStub.lastCall.args, [ assert.deepEqual(fireStub.lastCall.args, [
'comment-update', { 'comment-update', {
comment: { comment: {
@@ -526,10 +523,11 @@ limitations under the License.
assert.isTrue(element.disabled, assert.isTrue(element.disabled,
'Element should be disabled when creating draft.'); 'Element should be disabled when creating draft.');
element._xhrPromise.then(function(draft) { element._xhrPromise.then(draft => {
assert(fireStub.calledWith('comment-save'), assert(fireStub.calledWith('comment-save'),
'comment-save should be sent'); 'comment-save should be sent');
assert(cancelDebounce.calledWith('store')); assert(cancelDebounce.calledWith('store'));
assert.deepEqual(fireStub.lastCall.args[1], { assert.deepEqual(fireStub.lastCall.args[1], {
comment: { comment: {
__commentSide: 'right', __commentSide: 'right',
@@ -545,10 +543,10 @@ limitations under the License.
patchNum: 1, patchNum: 1,
}); });
assert.isFalse(element.disabled, assert.isFalse(element.disabled,
'Element should be enabled when done creating draft.'); 'Element should be enabled when done creating draft.');
assert.equal(draft.message, 'saved!'); assert.equal(draft.message, 'saved!');
assert.isFalse(element.editing); assert.isFalse(element.editing);
}).then(function() { }).then(() => {
MockInteractions.tap(element.$$('.edit')); MockInteractions.tap(element.$$('.edit'));
element._messageText = 'You’ll be delivering a package to Chapek 9, ' + element._messageText = 'You’ll be delivering a package to Chapek 9, ' +
'a world where humans are killed on sight.'; 'a world where humans are killed on sight.';
@@ -556,7 +554,7 @@ limitations under the License.
assert.isTrue(element.disabled, assert.isTrue(element.disabled,
'Element should be disabled when updating draft.'); 'Element should be disabled when updating draft.');
element._xhrPromise.then(function(draft) { element._xhrPromise.then(draft => {
assert.isFalse(element.disabled, assert.isFalse(element.disabled,
'Element should be enabled when done updating draft.'); 'Element should be enabled when done updating draft.');
assert.equal(draft.message, 'saved!'); assert.equal(draft.message, 'saved!');
@@ -567,26 +565,26 @@ limitations under the License.
}); });
}); });
test('clicking on date link does not trigger nav', function() { test('clicking on date link does not trigger nav', () => {
var showStub = sinon.stub(page, 'show'); const showStub = sinon.stub(page, 'show');
var dateEl = element.$$('.date'); const dateEl = element.$$('.date');
assert.ok(dateEl); assert.ok(dateEl);
MockInteractions.tap(dateEl); MockInteractions.tap(dateEl);
var dest = window.location.pathname + '#5'; const dest = window.location.pathname + '#5';
assert(showStub.lastCall.calledWithExactly(dest, null, false), assert(showStub.lastCall.calledWithExactly(dest, null, false),
'Should navigate to ' + dest + ' without triggering nav'); 'Should navigate to ' + dest + ' without triggering nav');
showStub.restore(); showStub.restore();
}); });
test('proper event fires on resolve', function(done) { test('proper event fires on resolve', done => {
element.addEventListener('comment-update', function(e) { element.addEventListener('comment-update', e => {
assert.isTrue(e.detail.comment.unresolved); assert.isTrue(e.detail.comment.unresolved);
done(); done();
}); });
MockInteractions.tap(element.$$('.resolve input')); MockInteractions.tap(element.$$('.resolve input'));
}); });
test('resolved comment state indicated by checkbox', function() { test('resolved comment state indicated by checkbox', () => {
element.comment = {unresolved: false}; element.comment = {unresolved: false};
assert.isTrue(element.$$('.resolve input').checked); assert.isTrue(element.$$('.resolve input').checked);
element.comment = {unresolved: true}; element.comment = {unresolved: true};