From 1c16f8fe19e36a55f421d6e9f6f7d847fb5469dc Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Fri, 18 Sep 2020 14:33:10 -0400 Subject: [PATCH] fix: Lint errors for account username return type --- addons/api/addon/models/account.js | 10 +++++++--- addons/api/tests/unit/models/account-test.js | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/addons/api/addon/models/account.js b/addons/api/addon/models/account.js index 4f880e07d..de5209c34 100644 --- a/addons/api/addon/models/account.js +++ b/addons/api/addon/models/account.js @@ -16,11 +16,15 @@ export default class AccountModel extends GeneratedAccountModel { * Convenience for getting username in account. * @type {string} */ - @computed('attributes') + @computed('attributes.{login_name}') get username() { - if(this.type === 'password') { - return this.attributes.login_name; + let username = ''; + switch (this.type) { + case 'password': + username = this.attributes.login_name; + break; } + return username; } // =methods diff --git a/addons/api/tests/unit/models/account-test.js b/addons/api/tests/unit/models/account-test.js index f6cbfbcc5..f937b3c26 100644 --- a/addons/api/tests/unit/models/account-test.js +++ b/addons/api/tests/unit/models/account-test.js @@ -17,7 +17,7 @@ module('Unit | Model | account', function (hooks) { name: 'name', type: 'password', }); - assert.equal(model.username, null); + assert.notOk(model.username); model.attributes.login_name = 'username'; assert.equal(model.username, 'username'); });