diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-10-30 16:36:07 -0500 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-10-31 14:33:12 -0500 |
commit | 3d13d369f9a5c33466c8f5c99b79f92de5f85ba0 (patch) | |
tree | ba9f1503f137375174b8572c74a1b35fccb4d86a | |
parent | 160157a92b4b0f493201a815e6e827e92abbf7c3 (diff) | |
download | gitlab-ce-3d13d369f9a5c33466c8f5c99b79f92de5f85ba0.tar.gz |
Fix eslint violations
-rw-r--r-- | app/assets/javascripts/gfm_auto_complete.js | 2 | ||||
-rw-r--r-- | spec/javascripts/lib/utils/common_utils_spec.js | 1 | ||||
-rw-r--r-- | spec/javascripts/sidebar/assignees_spec.js | 5 |
3 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/gfm_auto_complete.js b/app/assets/javascripts/gfm_auto_complete.js index 8f18aadb5e9..00b3d283570 100644 --- a/app/assets/javascripts/gfm_auto_complete.js +++ b/app/assets/javascripts/gfm_auto_complete.js @@ -569,8 +569,8 @@ GfmAutoComplete.Members = { template: '<li>${avatarTag} ${username} <small>${title}</small></li>', }; GfmAutoComplete.Labels = { - // eslint-disable-next-line no-template-curly-in-string template: + // eslint-disable-next-line no-template-curly-in-string '<li><span class="dropdown-label-box" style="background: ${color}"></span> ${title}</li>', }; // Issues, MergeRequests and Snippets diff --git a/spec/javascripts/lib/utils/common_utils_spec.js b/spec/javascripts/lib/utils/common_utils_spec.js index efff233451e..0fb90c3b78c 100644 --- a/spec/javascripts/lib/utils/common_utils_spec.js +++ b/spec/javascripts/lib/utils/common_utils_spec.js @@ -183,6 +183,7 @@ describe('common_utils', () => { scope: 'all', page: '2', }); + expect(commonUtils.parseQueryStringIntoObject('scope=all')).toEqual({ scope: 'all' }); expect(commonUtils.parseQueryStringIntoObject()).toEqual({}); }); diff --git a/spec/javascripts/sidebar/assignees_spec.js b/spec/javascripts/sidebar/assignees_spec.js index 6076fb07bc9..eced4925489 100644 --- a/spec/javascripts/sidebar/assignees_spec.js +++ b/spec/javascripts/sidebar/assignees_spec.js @@ -91,6 +91,7 @@ describe('Assignee component', () => { expect(assignee.querySelector('.avatar').getAttribute('alt')).toEqual( `${UsersMock.user.name}'s avatar`, ); + expect(assignee.querySelector('.author').innerText.trim()).toEqual(UsersMock.user.name); }); @@ -154,6 +155,7 @@ describe('Assignee component', () => { expect(first.querySelector('.avatar').getAttribute('alt')).toEqual( `${users[0].name}'s avatar`, ); + expect(first.querySelector('.author').innerText.trim()).toEqual(users[0].name); const second = collapsed.children[1]; @@ -162,6 +164,7 @@ describe('Assignee component', () => { expect(second.querySelector('.avatar').getAttribute('alt')).toEqual( `${users[1].name}'s avatar`, ); + expect(second.querySelector('.author').innerText.trim()).toEqual(users[1].name); }); @@ -185,6 +188,7 @@ describe('Assignee component', () => { expect(first.querySelector('.avatar').getAttribute('alt')).toEqual( `${users[0].name}'s avatar`, ); + expect(first.querySelector('.author').innerText.trim()).toEqual(users[0].name); const second = collapsed.children[1]; @@ -219,6 +223,7 @@ describe('Assignee component', () => { expect(component.$el.querySelectorAll('.user-item').length).toEqual( component.defaultRenderCount, ); + expect(component.$el.querySelector('.user-list-more')).not.toBe(null); const usersLabelExpectation = users.length - component.defaultRenderCount; |