summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-10-30 16:36:07 -0500
committerMike Greiling <mike@pixelcog.com>2018-10-30 16:36:07 -0500
commitb6b63bc759b0eb894092ad1c6e5616e21e5a0e3f (patch)
tree35e86ff5078726974c41c8bfc2106c1ae0a5ebf0
parent8373fbbba7c901ae2a735f651fabab20731cc8bc (diff)
downloadgitlab-ce-prettify-all-remaining-things.tar.gz
Fix eslint violationsprettify-all-remaining-things
-rw-r--r--app/assets/javascripts/gfm_auto_complete.js2
-rw-r--r--spec/javascripts/lib/utils/common_utils_spec.js1
-rw-r--r--spec/javascripts/sidebar/assignees_spec.js5
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 5b7acfee335..cf7427b3815 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;