BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
855c258f
Unverified
Commit
855c258f
authored
Sep 12, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed todos spec
parent
08362d80
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
28 deletions
+15
-28
todos.js
app/assets/javascripts/todos.js
+6
-11
todos_spec.js
spec/javascripts/todos_spec.js
+9
-17
No files found.
app/assets/javascripts/todos.js
View file @
855c258f
...
...
@@ -138,22 +138,17 @@ export default class Todos {
goToTodoUrl
(
e
)
{
const
todoLink
=
this
.
dataset
.
url
;
if
(
!
todoLink
)
{
if
(
!
todoLink
||
e
.
target
.
tagName
===
'A'
||
e
.
target
.
tagName
===
'IMG'
)
{
return
;
}
e
.
stopPropagation
();
e
.
preventDefault
();
if
(
isMetaClick
(
e
))
{
const
windowTarget
=
'_blank'
;
const
selected
=
e
.
target
;
e
.
stopPropagation
();
e
.
preventDefault
();
if
(
selected
.
tagName
===
'IMG'
)
{
const
avatarUrl
=
selected
.
parentElement
.
getAttribute
(
'href'
);
window
.
open
(
avatarUrl
,
windowTarget
);
}
else
{
window
.
open
(
todoLink
,
windowTarget
);
}
window
.
open
(
todoLink
,
windowTarget
);
}
else
{
gl
.
utils
.
visitUrl
(
todoLink
);
}
...
...
spec/javascripts/todos_spec.js
View file @
855c258f
...
...
@@ -26,38 +26,30 @@ describe('Todos', () => {
describe
(
'meta click'
,
()
=>
{
let
visitUrlSpy
;
let
windowOpenSpy
;
let
metakeyEvent
;
beforeEach
(()
=>
{
metakeyEvent
=
$
.
Event
(
'click'
,
{
keyCode
:
91
,
ctrlKey
:
true
});
visitUrlSpy
=
spyOn
(
gl
.
utils
,
'visitUrl'
).
and
.
callFake
(()
=>
{});
windowOpenSpy
=
spyOn
(
window
,
'open'
).
and
.
callFake
(()
=>
{});
});
it
(
'opens the todo url in another tab'
,
(
done
)
=>
{
it
(
'opens the todo url in another tab'
,
()
=>
{
const
todoLink
=
todoItem
.
dataset
.
url
;
spyOn
(
window
,
'open'
).
and
.
callFake
((
url
,
target
)
=>
{
expect
(
todoLink
).
toEqual
(
url
);
expect
(
target
).
toEqual
(
'_blank'
);
done
();
});
$
(
'.todos-list .todo'
).
trigger
(
metakeyEvent
);
expect
(
visitUrlSpy
).
not
.
toHaveBeenCalled
();
expect
(
windowOpenSpy
).
toHaveBeenCalledWith
(
todoLink
,
'_blank'
);
});
it
(
'opens the avatar
\'
s url in another tab when the avatar is clicked'
,
(
done
)
=>
{
const
avatarImage
=
todoItem
.
querySelector
(
'img'
);
const
avatarUrl
=
avatarImage
.
parentElement
.
getAttribute
(
'href'
);
spyOn
(
window
,
'open'
).
and
.
callFake
((
url
,
target
)
=>
{
expect
(
avatarUrl
).
toEqual
(
url
);
expect
(
target
).
toEqual
(
'_blank'
);
done
();
});
it
(
'run native funcionality when avatar is clicked'
,
()
=>
{
$
(
'.todos-list a'
).
on
(
'click'
,
e
=>
e
.
preventDefault
());
$
(
'.todos-list img'
).
trigger
(
metakeyEvent
);
avatarImage
.
click
();
expect
(
visitUrlSpy
).
not
.
toHaveBeenCalled
();
expect
(
windowOpenSpy
).
not
.
toHaveBeenCalled
();
});
});
});
...
...
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