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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
0e29a760
Commit
0e29a760
authored
Aug 07, 2018
by
André Luís
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix broken karma re: avatar width param
parent
fe22042f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
ee/spec/javascripts/epics/epic_show/components/epic_header_spec.js
...avascripts/epics/epic_show/components/epic_header_spec.js
+6
-4
spec/javascripts/vue_shared/security_reports/card_security_reports_app_spec.js
...shared/security_reports/card_security_reports_app_spec.js
+3
-1
No files found.
ee/spec/javascripts/epics/epic_show/components/epic_header_spec.js
View file @
0e29a760
...
...
@@ -21,7 +21,7 @@ describe('epicHeader', () => {
});
it
(
'
should render author avatar
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
img
'
).
src
).
toEqual
(
author
.
src
);
expect
(
vm
.
$el
.
querySelector
(
'
img
'
).
src
).
toEqual
(
`
${
author
.
src
}
?width=24`
);
});
it
(
'
should render author name
'
,
()
=>
{
...
...
@@ -29,7 +29,9 @@ describe('epicHeader', () => {
});
it
(
'
should render username tooltip
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.user-avatar-link span
'
).
dataset
.
originalTitle
).
toEqual
(
author
.
username
);
expect
(
vm
.
$el
.
querySelector
(
'
.user-avatar-link span
'
).
dataset
.
originalTitle
).
toEqual
(
author
.
username
,
);
});
describe
(
'
canDelete
'
,
()
=>
{
...
...
@@ -37,7 +39,7 @@ describe('epicHeader', () => {
expect
(
vm
.
$el
.
querySelector
(
'
.btn-remove
'
)).
toBeNull
();
});
it
(
'
should show loading button if canDelete
'
,
(
done
)
=>
{
it
(
'
should show loading button if canDelete
'
,
done
=>
{
vm
.
canDelete
=
true
;
Vue
.
nextTick
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.btn-remove
'
)).
toBeDefined
();
...
...
@@ -49,7 +51,7 @@ describe('epicHeader', () => {
describe
(
'
delete epic
'
,
()
=>
{
let
deleteEpic
;
beforeEach
(
(
done
)
=>
{
beforeEach
(
done
=>
{
deleteEpic
=
jasmine
.
createSpy
();
spyOn
(
window
,
'
confirm
'
).
and
.
returnValue
(
true
);
vm
.
canDelete
=
true
;
...
...
spec/javascripts/vue_shared/security_reports/card_security_reports_app_spec.js
View file @
0e29a760
...
...
@@ -95,7 +95,9 @@ describe('Card security reports app', () => {
expect
(
userAvatarLink
).
not
.
toBeNull
();
expect
(
userAvatarLink
.
getAttribute
(
'
href
'
)).
toBe
(
`
${
TEST_HOST
}
/user`
);
expect
(
userAvatarLink
.
querySelector
(
'
img
'
).
getAttribute
(
'
src
'
)).
toBe
(
`
${
TEST_HOST
}
/img`
);
expect
(
userAvatarLink
.
querySelector
(
'
img
'
).
getAttribute
(
'
src
'
)).
toBe
(
`
${
TEST_HOST
}
/img?width=24`
,
);
expect
(
userAvatarLink
.
textContent
).
toBe
(
'
TestUser
'
);
});
...
...
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