From fbad19e18e0a0a9b5b4dcc57b2696d15fe4e1e07 Mon Sep 17 00:00:00 2001 From: Kasper Nilsson Date: Wed, 17 May 2017 16:00:33 -0700 Subject: [PATCH] Catch-all fix for merged linter errors Bug: Issue 6179 Change-Id: I436b6dbd88e83b4d901d5446a0c7900678be157d --- .../gr-search-bar/gr-search-bar_test.html | 12 +-- .../gr-confirm-delete-comment-dialog.js | 6 +- .../gr-diff-comment/gr-diff-comment_test.html | 8 +- .../diff/gr-diff-highlight/gr-annotation.js | 1 - .../elements/diff/gr-diff/gr-diff_test.html | 2 +- .../gr-autocomplete-dropdown_test.html | 90 +++++++++---------- .../gr-rest-api-interface.js | 10 +-- .../gr-rest-api-interface_test.html | 10 +-- .../gr-reviewer-updates-parser.js | 2 +- .../gr-reviewer-updates-parser_test.html | 16 ++-- polygerrit-ui/app/elements/test/plugin.html | 2 +- polygerrit-ui/app/scripts/hiddenscroll.js | 6 +- 12 files changed, 80 insertions(+), 85 deletions(-) diff --git a/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar_test.html b/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar_test.html index 96240cd6d9..54ca3995d1 100644 --- a/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar_test.html +++ b/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar_test.html @@ -51,7 +51,7 @@ limitations under the License. return document.activeElement.shadowRoot ? document.activeElement.shadowRoot.activeElement : document.activeElement; - } + }; test('tap on search button triggers nav', done => { sinon.stub(page, 'show', () => { @@ -203,11 +203,11 @@ limitations under the License. }); test('Autocomplete doesnt override exact matches to input', done => { - element._getSearchSuggestions('ownerin:gerrit').then(s => { - assert.equal(s[0].value, 'ownerin:gerrit'); - done(); - }); - }); + element._getSearchSuggestions('ownerin:gerrit').then(s => { + assert.equal(s[0].value, 'ownerin:gerrit'); + done(); + }); + }); test('Autocomplete respects spaces', done => { element._getSearchSuggestions('is:ope').then(s => { diff --git a/polygerrit-ui/app/elements/diff/gr-confirm-delete-comment-dialog/gr-confirm-delete-comment-dialog.js b/polygerrit-ui/app/elements/diff/gr-confirm-delete-comment-dialog/gr-confirm-delete-comment-dialog.js index 7b4092d863..e0eb078a79 100644 --- a/polygerrit-ui/app/elements/diff/gr-confirm-delete-comment-dialog/gr-confirm-delete-comment-dialog.js +++ b/polygerrit-ui/app/elements/diff/gr-confirm-delete-comment-dialog/gr-confirm-delete-comment-dialog.js @@ -33,16 +33,16 @@ message: String, }, - resetFocus: function() { + resetFocus() { this.$.messageInput.textarea.focus(); }, - _handleConfirmTap: function(e) { + _handleConfirmTap(e) { e.preventDefault(); this.fire('confirm', {reason: this.message}, {bubbles: false}); }, - _handleCancelTap: function(e) { + _handleCancelTap(e) { e.preventDefault(); this.fire('cancel', null, {bubbles: false}); }, diff --git a/polygerrit-ui/app/elements/diff/gr-diff-comment/gr-diff-comment_test.html b/polygerrit-ui/app/elements/diff/gr-diff-comment/gr-diff-comment_test.html index 835ecb8016..647b669b25 100644 --- a/polygerrit-ui/app/elements/diff/gr-diff-comment/gr-diff-comment_test.html +++ b/polygerrit-ui/app/elements/diff/gr-diff-comment/gr-diff-comment_test.html @@ -246,12 +246,12 @@ limitations under the License. assert.isTrue(element._handleSave.called); }); }); - test('delete comment button for non-admins is hidden', function() { + test('delete comment button for non-admins is hidden', () => { element._isAdmin = false; assert.isTrue(element.$$('.action.delete').hidden); }); - test('delete comment', function(done) { + test('delete comment', done => { sandbox.stub( element.$.restAPI, 'deleteComment').returns(Promise.resolve()); sandbox.spy(element.$.overlay, 'open'); @@ -259,7 +259,7 @@ limitations under the License. element.patchNum = 0xDEADBEEF; element._isAdmin = true; MockInteractions.tap(element.$$('.action.delete')); - element.$.overlay.open.lastCall.returnValue.then(function() { + element.$.overlay.open.lastCall.returnValue.then(() => { element.$.confirmDeleteComment.message = 'removal reason'; element._handleConfirmDeleteComment(); assert.isTrue(element.$.restAPI.deleteComment.calledWith( @@ -494,7 +494,7 @@ limitations under the License. test('draft saving/editing', done => { const fireStub = sinon.stub(element, 'fire'); - let cancelDebounce = sandbox.stub(element, 'cancelDebouncer'); + const cancelDebounce = sandbox.stub(element, 'cancelDebouncer'); element.draft = true; MockInteractions.tap(element.$$('.edit')); diff --git a/polygerrit-ui/app/elements/diff/gr-diff-highlight/gr-annotation.js b/polygerrit-ui/app/elements/diff/gr-diff-highlight/gr-annotation.js index e20542ca01..9afbf2bf94 100644 --- a/polygerrit-ui/app/elements/diff/gr-diff-highlight/gr-annotation.js +++ b/polygerrit-ui/app/elements/diff/gr-diff-highlight/gr-annotation.js @@ -46,7 +46,6 @@ */ annotateElement(parent, offset, length, cssClass) { const nodes = [].slice.apply(parent.childNodes); - let node; let nodeLength; let subLength; diff --git a/polygerrit-ui/app/elements/diff/gr-diff/gr-diff_test.html b/polygerrit-ui/app/elements/diff/gr-diff/gr-diff_test.html index a199370884..bd7adfe7c7 100644 --- a/polygerrit-ui/app/elements/diff/gr-diff/gr-diff_test.html +++ b/polygerrit-ui/app/elements/diff/gr-diff/gr-diff_test.html @@ -928,7 +928,7 @@ limitations under the License. test('saving a draft', () => { const draftID = 'tempID'; const id = 'savedID'; - let comment = { + const comment = { __draft: true, __draftID: draftID, side: 'PARENT', diff --git a/polygerrit-ui/app/elements/shared/gr-autocomplete-dropdown/gr-autocomplete-dropdown_test.html b/polygerrit-ui/app/elements/shared/gr-autocomplete-dropdown/gr-autocomplete-dropdown_test.html index ca7a670b93..f054a57de1 100644 --- a/polygerrit-ui/app/elements/shared/gr-autocomplete-dropdown/gr-autocomplete-dropdown_test.html +++ b/polygerrit-ui/app/elements/shared/gr-autocomplete-dropdown/gr-autocomplete-dropdown_test.html @@ -57,8 +57,7 @@ limitations under the License. if (element.isOpen) element.close(); }); - test('the dropdown has not been moved from the text fixture to the body', - () => { + test('dropdown has not been moved from text fixture to the body', () => { assert.equal(Polymer.dom(document.root) .querySelectorAll('gr-autocomplete-dropdown').length, 1); const dropdown = Polymer.dom(document.root) @@ -148,54 +147,53 @@ limitations under the License. element.suggestions = []; assert.isTrue(resetStopsSpy.called); }); -}); - -suite('gr-autocomplete-dropdown to root', () => { - let element; - let sandbox; - - setup(() => { - sandbox = sinon.sandbox.create(); - fixture('move').open(); - // The element was moved to the body, so look for it there. - element = Polymer.dom(document.root) - .querySelector('gr-autocomplete-dropdown'); - element.suggestions = [ - {value: 'test value 1', name: 'test name 1', text: 1}, - {value: 'test value 2', name: 'test name 2', text: 2}]; }); - teardown(() => { - sandbox.restore(); - if (!element.hidden) element.close(); - }); + suite('gr-autocomplete-dropdown to root', () => { + let element; + let sandbox; - test('the dropdown has been moved from the text fixture to the body', - () => { - assert.equal(Polymer.dom(document.root) - .querySelectorAll('gr-autocomplete-dropdown').length, 1); - const dropdown = Polymer.dom(document.root) - .querySelector('gr-autocomplete-dropdown'); - assert.isOk(dropdown); - assert.deepEqual(dropdown.parentElement, Polymer.dom(document.root) - .querySelector('body')); - }); + setup(() => { + sandbox = sinon.sandbox.create(); + fixture('move').open(); + // The element was moved to the body, so look for it there. + element = Polymer.dom(document.root) + .querySelector('gr-autocomplete-dropdown'); + element.suggestions = [ + {value: 'test value 1', name: 'test name 1', text: 1}, + {value: 'test value 2', name: 'test name 2', text: 2}]; + }); - test('closing removes from body and adding adds to body', () => { - element.close(); - assert.equal(Polymer.dom(document.root) - .querySelectorAll('gr-autocomplete-dropdown').length, 0); - element.open(); - assert.equal(Polymer.dom(document.root) - .querySelectorAll('gr-autocomplete-dropdown').length, 1); - }); + teardown(() => { + sandbox.restore(); + if (!element.hidden) element.close(); + }); - test('setPosition', () => { - const top = '10px'; - const left = '20px'; - element.setPosition(top, left); - assert.equal(getComputedStyle(element).top, top); - assert.equal(getComputedStyle(element).left, left); + test('dropdown has been moved from the text fixture to the body', () => { + assert.equal(Polymer.dom(document.root) + .querySelectorAll('gr-autocomplete-dropdown').length, 1); + const dropdown = Polymer.dom(document.root) + .querySelector('gr-autocomplete-dropdown'); + assert.isOk(dropdown); + assert.deepEqual(dropdown.parentElement, Polymer.dom(document.root) + .querySelector('body')); + }); + + test('closing removes from body and adding adds to body', () => { + element.close(); + assert.equal(Polymer.dom(document.root) + .querySelectorAll('gr-autocomplete-dropdown').length, 0); + element.open(); + assert.equal(Polymer.dom(document.root) + .querySelectorAll('gr-autocomplete-dropdown').length, 1); + }); + + test('setPosition', () => { + const top = '10px'; + const left = '20px'; + element.setPosition(top, left); + assert.equal(getComputedStyle(element).top, top); + assert.equal(getComputedStyle(element).left, left); + }); }); -}); diff --git a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js index 443cb8a74b..43e2cf1e8c 100644 --- a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js +++ b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js @@ -1126,13 +1126,11 @@ 'POST', this.getChangeActionURL(changeNum, null, '/ready'), review); }, - deleteComment: function(changeNum, patchNum, commentID, reason) { - var url = this._changeBaseURL(changeNum, patchNum) + + deleteComment(changeNum, patchNum, commentID, reason) { + const url = this._changeBaseURL(changeNum, patchNum) + '/comments/' + commentID + '/delete'; - return this.send('POST', url, {reason: reason}).then( - function(response) { - return this.getResponseObject(response); - }.bind(this)); + return this.send('POST', url, {reason}).then(response => + this.getResponseObject(response)); }, }); })(); diff --git a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface_test.html b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface_test.html index 391ca1619d..9b8820ab67 100644 --- a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface_test.html +++ b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface_test.html @@ -635,13 +635,13 @@ limitations under the License. sandbox.stub(element, 'send').returns(Promise.resolve()); sandbox.stub(element, 'getResponseObject').returns('some response'); element.deleteComment('foo', 'bar', '01234', 'removal reason') - .then(response => { - assert.equal(response, 'some response'); - done(); - }); + .then(response => { + assert.equal(response, 'some response'); + done(); + }); assert.isTrue(element.send.calledWith( 'POST', '/changes/foo/revisions/bar/comments/01234/delete', - {reason:'removal reason'})); + {reason: 'removal reason'})); }); }); diff --git a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-reviewer-updates-parser.js b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-reviewer-updates-parser.js index 4e9a0fe421..232532fe6e 100644 --- a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-reviewer-updates-parser.js +++ b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-reviewer-updates-parser.js @@ -214,7 +214,7 @@ if (nextMessageDate && date > nextMessageDate) { break; } - }; + } }); }; diff --git a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-reviewer-updates-parser_test.html b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-reviewer-updates-parser_test.html index 80608644f5..f27e068a5f 100644 --- a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-reviewer-updates-parser_test.html +++ b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-reviewer-updates-parser_test.html @@ -262,25 +262,25 @@ limitations under the License. type: 'REVIEWER_UPDATE', updates: [{ message: 'same time update', - }] + }], }, { date: tplus(200), type: 'REVIEWER_UPDATE', updates: [{ message: 'update within threshold', - }] + }], }, { date: tplus(600), type: 'REVIEWER_UPDATE', updates: [{ message: 'update between messages', - }] + }], }, { date: tplus(1000), type: 'REVIEWER_UPDATE', updates: [{ message: 'late update', - }] + }], }], messages: [{ id: '6734489eb9d642de28dbf2bcf9bda875923800d8', @@ -307,12 +307,12 @@ limitations under the License. type: 'REVIEWER_UPDATE', updates: [{ message: 'update within threshold', - }] + }], }); const makeRubbishMessage = () => ({ - id: '6734489eb9d642de28dbf2bcf9bda875923800d8', - date: '2016-02-17 19:04:18.000000000', - message: 'Uploaded patch set 2.', + id: '6734489eb9d642de28dbf2bcf9bda875923800d8', + date: '2016-02-17 19:04:18.000000000', + message: 'Uploaded patch set 2.', }); instance = new GrReviewerUpdatesParser({ messages: _.times(500, makeRubbishMessage), diff --git a/polygerrit-ui/app/elements/test/plugin.html b/polygerrit-ui/app/elements/test/plugin.html index cc4f3c309f..bd29b9065e 100644 --- a/polygerrit-ui/app/elements/test/plugin.html +++ b/polygerrit-ui/app/elements/test/plugin.html @@ -1,7 +1,7 @@ diff --git a/polygerrit-ui/app/scripts/hiddenscroll.js b/polygerrit-ui/app/scripts/hiddenscroll.js index bb9a160c77..b80742ac08 100644 --- a/polygerrit-ui/app/scripts/hiddenscroll.js +++ b/polygerrit-ui/app/scripts/hiddenscroll.js @@ -18,10 +18,10 @@ window.Gerrit.hiddenscroll = undefined; - window.addEventListener('WebComponentsReady', function() { - var elem = document.createElement('div'); + window.addEventListener('WebComponentsReady', () => { + const elem = document.createElement('div'); elem.setAttribute( - 'style', 'width:100px;height:100px;overflow:scroll'); + 'style', 'width:100px;height:100px;overflow:scroll'); document.body.appendChild(elem); window.Gerrit.hiddenscroll = elem.offsetWidth === elem.clientWidth; elem.remove();