ES6ify /gr-account-info/* Bug: Issue 6179 Change-Id: I134846ec77a4d38de5a101451f8d16ca18c35210
diff --git a/polygerrit-ui/app/elements/settings/gr-account-info/gr-account-info.js b/polygerrit-ui/app/elements/settings/gr-account-info/gr-account-info.js index 91bc628..010b136 100644 --- a/polygerrit-ui/app/elements/settings/gr-account-info/gr-account-info.js +++ b/polygerrit-ui/app/elements/settings/gr-account-info/gr-account-info.js
@@ -60,25 +60,25 @@ '_statusChanged(_account.status)', ], - loadData: function() { - var promises = []; + loadData() { + const promises = []; this._loading = true; - promises.push(this.$.restAPI.getConfig().then(function(config) { + promises.push(this.$.restAPI.getConfig().then(config => { this._serverConfig = config; - }.bind(this))); + })); - promises.push(this.$.restAPI.getAccount().then(function(account) { + promises.push(this.$.restAPI.getAccount().then(account => { this._account = account; - }.bind(this))); + })); - return Promise.all(promises).then(function() { + return Promise.all(promises).then(() => { this._loading = false; - }.bind(this)); + }); }, - save: function() { + save() { if (!this.hasUnsavedChanges) { return Promise.resolve(); } @@ -88,45 +88,45 @@ // Must be done in sequence to avoid race conditions (@see Issue 5721) return this._maybeSetName() .then(this._maybeSetStatus.bind(this)) - .then(function() { + .then(() => { this._hasNameChange = false; this._hasStatusChange = false; this._saving = false; this.fire('account-detail-update'); - }.bind(this)); + }); }, - _maybeSetName: function() { + _maybeSetName() { return this._hasNameChange && this.mutable ? this.$.restAPI.setAccountName(this._account.name) : Promise.resolve(); }, - _maybeSetStatus: function() { + _maybeSetStatus() { return this._hasStatusChange ? this.$.restAPI.setAccountStatus(this._account.status) : Promise.resolve(); }, - _computeHasUnsavedChanges: function(name, status) { + _computeHasUnsavedChanges(name, status) { return name || status; }, - _computeMutable: function(config) { - return config.auth.editable_account_fields.indexOf('FULL_NAME') !== -1; + _computeMutable(config) { + return config.auth.editable_account_fields.includes('FULL_NAME'); }, - _statusChanged: function() { + _statusChanged() { if (this._loading) { return; } this._hasStatusChange = true; }, - _nameChanged: function() { + _nameChanged() { if (this._loading) { return; } this._hasNameChange = true; }, - _handleKeydown: function(e) { + _handleKeydown(e) { if (e.keyCode === 13) { // Enter e.stopPropagation(); this.save();
diff --git a/polygerrit-ui/app/elements/settings/gr-account-info/gr-account-info_test.html b/polygerrit-ui/app/elements/settings/gr-account-info/gr-account-info_test.html index cf35450..d354f07 100644 --- a/polygerrit-ui/app/elements/settings/gr-account-info/gr-account-info_test.html +++ b/polygerrit-ui/app/elements/settings/gr-account-info/gr-account-info_test.html
@@ -33,16 +33,16 @@ </test-fixture> <script> - suite('gr-account-info tests', function() { - var element; - var account; - var config; - var sandbox; + suite('gr-account-info tests', () => { + let element; + let account; + let config; + let sandbox; function valueOf(title) { - var sections = Polymer.dom(element.root).querySelectorAll('section'); - var titleEl; - for (var i = 0; i < sections.length; i++) { + const sections = Polymer.dom(element.root).querySelectorAll('section'); + let titleEl; + for (let i = 0; i < sections.length; i++) { titleEl = sections[i].querySelector('.title'); if (titleEl.textContent === title) { return sections[i].querySelector('.value'); @@ -50,7 +50,7 @@ } } - setup(function(done) { + setup(done => { sandbox = sinon.sandbox.create(); account = { _account_id: 123, @@ -62,22 +62,22 @@ config = {auth: {editable_account_fields: []}}; stub('gr-rest-api-interface', { - getAccount: function() { return Promise.resolve(account); }, - getConfig: function() { return Promise.resolve(config); }, - getPreferences: function() { + getAccount() { return Promise.resolve(account); }, + getConfig() { return Promise.resolve(config); }, + getPreferences() { return Promise.resolve({time_format: 'HHMM_12'}); }, }); element = fixture('basic'); // Allow the element to render. - element.loadData().then(function() { flush(done); }); + element.loadData().then(() => { flush(done); }); }); - teardown(function() { + teardown(() => { sandbox.restore(); }); - test('basic account info render', function() { + test('basic account info render', () => { assert.isFalse(element._loading); assert.equal(valueOf('ID').textContent, account._account_id); @@ -85,10 +85,10 @@ assert.equal(valueOf('Username').textContent, account.username); }); - test('user name render (immutable)', function() { - var section = element.$.nameSection; - var displaySpan = section.querySelectorAll('.value')[0]; - var inputSpan = section.querySelectorAll('.value')[1]; + test('user name render (immutable)', () => { + const section = element.$.nameSection; + const displaySpan = section.querySelectorAll('.value')[0]; + const inputSpan = section.querySelectorAll('.value')[1]; assert.isFalse(element.mutable); assert.isFalse(displaySpan.hasAttribute('hidden')); @@ -96,13 +96,13 @@ assert.isTrue(inputSpan.hasAttribute('hidden')); }); - test('user name render (mutable)', function() { + test('user name render (mutable)', () => { element.set('_serverConfig', {auth: {editable_account_fields: ['FULL_NAME']}}); - var section = element.$.nameSection; - var displaySpan = section.querySelectorAll('.value')[0]; - var inputSpan = section.querySelectorAll('.value')[1]; + const section = element.$.nameSection; + const displaySpan = section.querySelectorAll('.value')[0]; + const inputSpan = section.querySelectorAll('.value')[1]; assert.isTrue(element.mutable); assert.isTrue(displaySpan.hasAttribute('hidden')); @@ -110,25 +110,25 @@ assert.isFalse(inputSpan.hasAttribute('hidden')); }); - suite('account info edit', function() { - var nameChangedSpy; - var statusChangedSpy; - var nameStub; - var statusStub; + suite('account info edit', () => { + let nameChangedSpy; + let statusChangedSpy; + let nameStub; + let statusStub; - setup(function() { + setup(() => { nameChangedSpy = sandbox.spy(element, '_nameChanged'); statusChangedSpy = sandbox.spy(element, '_statusChanged'); element.set('_serverConfig', {auth: {editable_account_fields: ['FULL_NAME']}}); - nameStub = sandbox.stub(element.$.restAPI, 'setAccountName', - function(name) { return Promise.resolve(); }); + nameStub = sandbox.stub(element.$.restAPI, 'setAccountName', name => + Promise.resolve()); statusStub = sandbox.stub(element.$.restAPI, 'setAccountStatus', - function(status) { return Promise.resolve(); }); + status => Promise.resolve()); }); - test('name', function(done) { + test('name', done => { assert.isTrue(element.mutable); assert.isFalse(element.hasUnsavedChanges); @@ -142,13 +142,13 @@ assert.isTrue(nameStub.called); assert.isFalse(statusStub.called); - nameStub.lastCall.returnValue.then(function() { + nameStub.lastCall.returnValue.then(() => { assert.equal(nameStub.lastCall.args[0], 'new name'); done(); }); }); - test('status', function(done) { + test('status', done => { assert.isTrue(element.mutable); assert.isFalse(element.hasUnsavedChanges); @@ -158,10 +158,10 @@ assert.isTrue(statusChangedSpy.called); assert.isTrue(element.hasUnsavedChanges); - element.save().then(function() { + element.save().then(() => { assert.isTrue(statusStub.called); assert.isFalse(nameStub.called); - statusStub.lastCall.returnValue.then(function() { + statusStub.lastCall.returnValue.then(() => { assert.equal(statusStub.lastCall.args[0], 'new status'); done(); }); @@ -169,25 +169,25 @@ }); }); - suite('edit name and status', function() { - var nameChangedSpy; - var statusChangedSpy; - var nameStub; - var statusStub; + suite('edit name and status', () => { + let nameChangedSpy; + let statusChangedSpy; + let nameStub; + let statusStub; - setup(function() { + setup(() => { nameChangedSpy = sandbox.spy(element, '_nameChanged'); statusChangedSpy = sandbox.spy(element, '_statusChanged'); element.set('_serverConfig', {auth: {editable_account_fields: ['FULL_NAME']}}); - nameStub = sandbox.stub(element.$.restAPI, 'setAccountName', - function(name) { return Promise.resolve(); }); + nameStub = sandbox.stub(element.$.restAPI, 'setAccountName', name => + Promise.resolve()); statusStub = sandbox.stub(element.$.restAPI, 'setAccountStatus', - function(status) { return Promise.resolve(); }); + status => Promise.resolve()); }); - test('set name and status', function(done) { + test('set name and status', done => { assert.isTrue(element.mutable); assert.isFalse(element.hasUnsavedChanges); @@ -201,7 +201,7 @@ assert.isTrue(element.hasUnsavedChanges); - element.save().then(function() { + element.save().then(() => { assert.isTrue(statusStub.called); assert.isTrue(nameStub.called); @@ -214,23 +214,23 @@ }); }); - suite('set status but read name', function() { - var statusChangedSpy; - var statusStub; + suite('set status but read name', () => { + let statusChangedSpy; + let statusStub; - setup(function() { + setup(() => { statusChangedSpy = sandbox.spy(element, '_statusChanged'); element.set('_serverConfig', {auth: {editable_account_fields: []}}); statusStub = sandbox.stub(element.$.restAPI, 'setAccountStatus', - function(status) { return Promise.resolve(); }); + status => Promise.resolve()); }); - test('read full name but set status', function(done) { - var section = element.$.nameSection; - var displaySpan = section.querySelectorAll('.value')[0]; - var inputSpan = section.querySelectorAll('.value')[1]; + test('read full name but set status', done => { + const section = element.$.nameSection; + const displaySpan = section.querySelectorAll('.value')[0]; + const inputSpan = section.querySelectorAll('.value')[1]; assert.isFalse(element.mutable); @@ -246,9 +246,9 @@ assert.isTrue(element.hasUnsavedChanges); - element.save().then(function() { + element.save().then(() => { assert.isTrue(statusStub.called); - statusStub.lastCall.returnValue.then(function() { + statusStub.lastCall.returnValue.then(() => { assert.equal(statusStub.lastCall.args[0], 'new status'); done(); });