Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
3d13d369
Commit
3d13d369
authored
Oct 30, 2018
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix eslint violations
parent
160157a9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletion
+7
-1
app/assets/javascripts/gfm_auto_complete.js
app/assets/javascripts/gfm_auto_complete.js
+1
-1
spec/javascripts/lib/utils/common_utils_spec.js
spec/javascripts/lib/utils/common_utils_spec.js
+1
-0
spec/javascripts/sidebar/assignees_spec.js
spec/javascripts/sidebar/assignees_spec.js
+5
-0
No files found.
app/assets/javascripts/gfm_auto_complete.js
View file @
3d13d369
...
@@ -569,8 +569,8 @@ GfmAutoComplete.Members = {
...
@@ -569,8 +569,8 @@ GfmAutoComplete.Members = {
template
:
'
<li>${avatarTag} ${username} <small>${title}</small></li>
'
,
template
:
'
<li>${avatarTag} ${username} <small>${title}</small></li>
'
,
};
};
GfmAutoComplete
.
Labels
=
{
GfmAutoComplete
.
Labels
=
{
// eslint-disable-next-line no-template-curly-in-string
template
:
template
:
// eslint-disable-next-line no-template-curly-in-string
'
<li><span class="dropdown-label-box" style="background: ${color}"></span> ${title}</li>
'
,
'
<li><span class="dropdown-label-box" style="background: ${color}"></span> ${title}</li>
'
,
};
};
// Issues, MergeRequests and Snippets
// Issues, MergeRequests and Snippets
...
...
spec/javascripts/lib/utils/common_utils_spec.js
View file @
3d13d369
...
@@ -183,6 +183,7 @@ describe('common_utils', () => {
...
@@ -183,6 +183,7 @@ describe('common_utils', () => {
scope
:
'
all
'
,
scope
:
'
all
'
,
page
:
'
2
'
,
page
:
'
2
'
,
});
});
expect
(
commonUtils
.
parseQueryStringIntoObject
(
'
scope=all
'
)).
toEqual
({
scope
:
'
all
'
});
expect
(
commonUtils
.
parseQueryStringIntoObject
(
'
scope=all
'
)).
toEqual
({
scope
:
'
all
'
});
expect
(
commonUtils
.
parseQueryStringIntoObject
()).
toEqual
({});
expect
(
commonUtils
.
parseQueryStringIntoObject
()).
toEqual
({});
});
});
...
...
spec/javascripts/sidebar/assignees_spec.js
View file @
3d13d369
...
@@ -91,6 +91,7 @@ describe('Assignee component', () => {
...
@@ -91,6 +91,7 @@ describe('Assignee component', () => {
expect
(
assignee
.
querySelector
(
'
.avatar
'
).
getAttribute
(
'
alt
'
)).
toEqual
(
expect
(
assignee
.
querySelector
(
'
.avatar
'
).
getAttribute
(
'
alt
'
)).
toEqual
(
`
${
UsersMock
.
user
.
name
}
's avatar`
,
`
${
UsersMock
.
user
.
name
}
's avatar`
,
);
);
expect
(
assignee
.
querySelector
(
'
.author
'
).
innerText
.
trim
()).
toEqual
(
UsersMock
.
user
.
name
);
expect
(
assignee
.
querySelector
(
'
.author
'
).
innerText
.
trim
()).
toEqual
(
UsersMock
.
user
.
name
);
});
});
...
@@ -154,6 +155,7 @@ describe('Assignee component', () => {
...
@@ -154,6 +155,7 @@ describe('Assignee component', () => {
expect
(
first
.
querySelector
(
'
.avatar
'
).
getAttribute
(
'
alt
'
)).
toEqual
(
expect
(
first
.
querySelector
(
'
.avatar
'
).
getAttribute
(
'
alt
'
)).
toEqual
(
`
${
users
[
0
].
name
}
's avatar`
,
`
${
users
[
0
].
name
}
's avatar`
,
);
);
expect
(
first
.
querySelector
(
'
.author
'
).
innerText
.
trim
()).
toEqual
(
users
[
0
].
name
);
expect
(
first
.
querySelector
(
'
.author
'
).
innerText
.
trim
()).
toEqual
(
users
[
0
].
name
);
const
second
=
collapsed
.
children
[
1
];
const
second
=
collapsed
.
children
[
1
];
...
@@ -162,6 +164,7 @@ describe('Assignee component', () => {
...
@@ -162,6 +164,7 @@ describe('Assignee component', () => {
expect
(
second
.
querySelector
(
'
.avatar
'
).
getAttribute
(
'
alt
'
)).
toEqual
(
expect
(
second
.
querySelector
(
'
.avatar
'
).
getAttribute
(
'
alt
'
)).
toEqual
(
`
${
users
[
1
].
name
}
's avatar`
,
`
${
users
[
1
].
name
}
's avatar`
,
);
);
expect
(
second
.
querySelector
(
'
.author
'
).
innerText
.
trim
()).
toEqual
(
users
[
1
].
name
);
expect
(
second
.
querySelector
(
'
.author
'
).
innerText
.
trim
()).
toEqual
(
users
[
1
].
name
);
});
});
...
@@ -185,6 +188,7 @@ describe('Assignee component', () => {
...
@@ -185,6 +188,7 @@ describe('Assignee component', () => {
expect
(
first
.
querySelector
(
'
.avatar
'
).
getAttribute
(
'
alt
'
)).
toEqual
(
expect
(
first
.
querySelector
(
'
.avatar
'
).
getAttribute
(
'
alt
'
)).
toEqual
(
`
${
users
[
0
].
name
}
's avatar`
,
`
${
users
[
0
].
name
}
's avatar`
,
);
);
expect
(
first
.
querySelector
(
'
.author
'
).
innerText
.
trim
()).
toEqual
(
users
[
0
].
name
);
expect
(
first
.
querySelector
(
'
.author
'
).
innerText
.
trim
()).
toEqual
(
users
[
0
].
name
);
const
second
=
collapsed
.
children
[
1
];
const
second
=
collapsed
.
children
[
1
];
...
@@ -219,6 +223,7 @@ describe('Assignee component', () => {
...
@@ -219,6 +223,7 @@ describe('Assignee component', () => {
expect
(
component
.
$el
.
querySelectorAll
(
'
.user-item
'
).
length
).
toEqual
(
expect
(
component
.
$el
.
querySelectorAll
(
'
.user-item
'
).
length
).
toEqual
(
component
.
defaultRenderCount
,
component
.
defaultRenderCount
,
);
);
expect
(
component
.
$el
.
querySelector
(
'
.user-list-more
'
)).
not
.
toBe
(
null
);
expect
(
component
.
$el
.
querySelector
(
'
.user-list-more
'
)).
not
.
toBe
(
null
);
const
usersLabelExpectation
=
users
.
length
-
component
.
defaultRenderCount
;
const
usersLabelExpectation
=
users
.
length
-
component
.
defaultRenderCount
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment