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
Jérome Perrin
gitlab-ce
Commits
a9470c45
Commit
a9470c45
authored
May 24, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed karma failures
[ci skip]
parent
b2c27518
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
16 deletions
+24
-16
spec/javascripts/issue_show/components/title_spec.js
spec/javascripts/issue_show/components/title_spec.js
+3
-3
spec/javascripts/pipelines/graph/action_component_spec.js
spec/javascripts/pipelines/graph/action_component_spec.js
+4
-2
spec/javascripts/pipelines/graph/dropdown_action_component_spec.js
...scripts/pipelines/graph/dropdown_action_component_spec.js
+3
-1
spec/javascripts/pipelines/graph/job_component_spec.js
spec/javascripts/pipelines/graph/job_component_spec.js
+14
-10
No files found.
spec/javascripts/issue_show/components/title_spec.js
View file @
a9470c45
...
@@ -25,7 +25,7 @@ describe('Title component', () => {
...
@@ -25,7 +25,7 @@ describe('Title component', () => {
it
(
'
renders title HTML
'
,
()
=>
{
it
(
'
renders title HTML
'
,
()
=>
{
expect
(
expect
(
vm
.
$el
.
querySelector
(
'
h2
'
).
innerHTML
.
trim
(),
vm
.
$el
.
innerHTML
.
trim
(),
).
toBe
(
'
Testing <img>
'
);
).
toBe
(
'
Testing <img>
'
);
});
});
...
@@ -47,12 +47,12 @@ describe('Title component', () => {
...
@@ -47,12 +47,12 @@ describe('Title component', () => {
Vue
.
nextTick
(()
=>
{
Vue
.
nextTick
(()
=>
{
expect
(
expect
(
vm
.
$el
.
querySelector
(
'
h2
'
).
classList
.
contains
(
'
issue-realtime-pre-pulse
'
),
vm
.
$el
.
classList
.
contains
(
'
issue-realtime-pre-pulse
'
),
).
toBeTruthy
();
).
toBeTruthy
();
setTimeout
(()
=>
{
setTimeout
(()
=>
{
expect
(
expect
(
vm
.
$el
.
querySelector
(
'
h2
'
).
classList
.
contains
(
'
issue-realtime-trigger-pulse
'
),
vm
.
$el
.
classList
.
contains
(
'
issue-realtime-trigger-pulse
'
),
).
toBeTruthy
();
).
toBeTruthy
();
done
();
done
();
...
...
spec/javascripts/pipelines/graph/action_component_spec.js
View file @
a9470c45
...
@@ -4,7 +4,7 @@ import actionComponent from '~/pipelines/components/graph/action_component.vue';
...
@@ -4,7 +4,7 @@ import actionComponent from '~/pipelines/components/graph/action_component.vue';
describe
(
'
pipeline graph action component
'
,
()
=>
{
describe
(
'
pipeline graph action component
'
,
()
=>
{
let
component
;
let
component
;
beforeEach
(()
=>
{
beforeEach
((
done
)
=>
{
const
ActionComponent
=
Vue
.
extend
(
actionComponent
);
const
ActionComponent
=
Vue
.
extend
(
actionComponent
);
component
=
new
ActionComponent
({
component
=
new
ActionComponent
({
propsData
:
{
propsData
:
{
...
@@ -14,6 +14,8 @@ describe('pipeline graph action component', () => {
...
@@ -14,6 +14,8 @@ describe('pipeline graph action component', () => {
actionIcon
:
'
icon_action_cancel
'
,
actionIcon
:
'
icon_action_cancel
'
,
},
},
}).
$mount
();
}).
$mount
();
Vue
.
nextTick
(
done
);
});
});
it
(
'
should render a link
'
,
()
=>
{
it
(
'
should render a link
'
,
()
=>
{
...
@@ -27,7 +29,7 @@ describe('pipeline graph action component', () => {
...
@@ -27,7 +29,7 @@ describe('pipeline graph action component', () => {
it
(
'
should update bootstrap tooltip when title changes
'
,
(
done
)
=>
{
it
(
'
should update bootstrap tooltip when title changes
'
,
(
done
)
=>
{
component
.
tooltipText
=
'
changed
'
;
component
.
tooltipText
=
'
changed
'
;
Vue
.
nextTick
(()
=>
{
setTimeout
(()
=>
{
expect
(
component
.
$el
.
getAttribute
(
'
data-original-title
'
)).
toBe
(
'
changed
'
);
expect
(
component
.
$el
.
getAttribute
(
'
data-original-title
'
)).
toBe
(
'
changed
'
);
done
();
done
();
});
});
...
...
spec/javascripts/pipelines/graph/dropdown_action_component_spec.js
View file @
a9470c45
...
@@ -4,7 +4,7 @@ import dropdownActionComponent from '~/pipelines/components/graph/dropdown_actio
...
@@ -4,7 +4,7 @@ import dropdownActionComponent from '~/pipelines/components/graph/dropdown_actio
describe
(
'
action component
'
,
()
=>
{
describe
(
'
action component
'
,
()
=>
{
let
component
;
let
component
;
beforeEach
(()
=>
{
beforeEach
((
done
)
=>
{
const
DropdownActionComponent
=
Vue
.
extend
(
dropdownActionComponent
);
const
DropdownActionComponent
=
Vue
.
extend
(
dropdownActionComponent
);
component
=
new
DropdownActionComponent
({
component
=
new
DropdownActionComponent
({
propsData
:
{
propsData
:
{
...
@@ -14,6 +14,8 @@ describe('action component', () => {
...
@@ -14,6 +14,8 @@ describe('action component', () => {
actionIcon
:
'
icon_action_cancel
'
,
actionIcon
:
'
icon_action_cancel
'
,
},
},
}).
$mount
();
}).
$mount
();
Vue
.
nextTick
(
done
);
});
});
it
(
'
should render a link
'
,
()
=>
{
it
(
'
should render a link
'
,
()
=>
{
...
...
spec/javascripts/pipelines/graph/job_component_spec.js
View file @
a9470c45
...
@@ -27,13 +27,14 @@ describe('pipeline graph job component', () => {
...
@@ -27,13 +27,14 @@ describe('pipeline graph job component', () => {
});
});
describe
(
'
name with link
'
,
()
=>
{
describe
(
'
name with link
'
,
()
=>
{
it
(
'
should render the job name and status with a link
'
,
()
=>
{
it
(
'
should render the job name and status with a link
'
,
(
done
)
=>
{
const
component
=
new
JobComponent
({
const
component
=
new
JobComponent
({
propsData
:
{
propsData
:
{
job
:
mockJob
,
job
:
mockJob
,
},
},
}).
$mount
();
}).
$mount
();
Vue
.
nextTick
(()
=>
{
const
link
=
component
.
$el
.
querySelector
(
'
a
'
);
const
link
=
component
.
$el
.
querySelector
(
'
a
'
);
expect
(
link
.
getAttribute
(
'
href
'
)).
toEqual
(
mockJob
.
status
.
details_path
);
expect
(
link
.
getAttribute
(
'
href
'
)).
toEqual
(
mockJob
.
status
.
details_path
);
...
@@ -47,6 +48,9 @@ describe('pipeline graph job component', () => {
...
@@ -47,6 +48,9 @@ describe('pipeline graph job component', () => {
expect
(
expect
(
component
.
$el
.
querySelector
(
'
.ci-status-text
'
).
textContent
.
trim
(),
component
.
$el
.
querySelector
(
'
.ci-status-text
'
).
textContent
.
trim
(),
).
toEqual
(
mockJob
.
name
);
).
toEqual
(
mockJob
.
name
);
done
();
});
});
});
});
});
...
...
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