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
46ad550a
Commit
46ad550a
authored
Jan 12, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '41937-vue-prop-type' into 'master'
Resolve "Fix type is started key" Closes #41937 See merge request gitlab-org/gitlab-ce!16407
parents
5431b503
dddd261c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
1 deletion
+23
-1
header.vue
app/assets/javascripts/jobs/components/header.vue
+5
-1
header_spec.js
spec/javascripts/jobs/header_spec.js
+18
-0
No files found.
app/assets/javascripts/jobs/components/header.vue
View file @
46ad550a
...
@@ -30,8 +30,12 @@
...
@@ -30,8 +30,12 @@
shouldRenderContent
()
{
shouldRenderContent
()
{
return
!
this
.
isLoading
&&
Object
.
keys
(
this
.
job
).
length
;
return
!
this
.
isLoading
&&
Object
.
keys
(
this
.
job
).
length
;
},
},
/**
* When job has not started the key will be `false`
* When job started the key will be a string with a date.
*/
jobStarted
()
{
jobStarted
()
{
return
this
.
job
.
started
;
return
!
this
.
job
.
started
===
false
;
},
},
},
},
watch
:
{
watch
:
{
...
...
spec/javascripts/jobs/header_spec.js
View file @
46ad550a
...
@@ -31,6 +31,7 @@ describe('Job details header', () => {
...
@@ -31,6 +31,7 @@ describe('Job details header', () => {
email
:
'foo@bar.com'
,
email
:
'foo@bar.com'
,
avatar_url
:
'link'
,
avatar_url
:
'link'
,
},
},
started
:
'2018-01-08T09:48:27.319Z'
,
new_issue_path
:
'path'
,
new_issue_path
:
'path'
,
},
},
isLoading
:
false
,
isLoading
:
false
,
...
@@ -43,6 +44,11 @@ describe('Job details header', () => {
...
@@ -43,6 +44,11 @@ describe('Job details header', () => {
vm
.
$destroy
();
vm
.
$destroy
();
});
});
describe
(
'triggered job'
,
()
=>
{
beforeEach
(()
=>
{
vm
=
mountComponent
(
HeaderComponent
,
props
);
});
it
(
'should render provided job information'
,
()
=>
{
it
(
'should render provided job information'
,
()
=>
{
expect
(
expect
(
vm
.
$el
.
querySelector
(
'.header-main-content'
).
textContent
.
replace
(
/
\s
+/g
,
' '
).
trim
(),
vm
.
$el
.
querySelector
(
'.header-main-content'
).
textContent
.
replace
(
/
\s
+/g
,
' '
).
trim
(),
...
@@ -54,4 +60,16 @@ describe('Job details header', () => {
...
@@ -54,4 +60,16 @@ describe('Job details header', () => {
vm
.
$el
.
querySelector
(
'.js-new-issue'
).
getAttribute
(
'href'
),
vm
.
$el
.
querySelector
(
'.js-new-issue'
).
getAttribute
(
'href'
),
).
toEqual
(
props
.
job
.
new_issue_path
);
).
toEqual
(
props
.
job
.
new_issue_path
);
});
});
});
describe
(
'created job'
,
()
=>
{
it
(
'should render created key'
,
()
=>
{
props
.
job
.
started
=
false
;
vm
=
mountComponent
(
HeaderComponent
,
props
);
expect
(
vm
.
$el
.
querySelector
(
'.header-main-content'
).
textContent
.
replace
(
/
\s
+/g
,
' '
).
trim
(),
).
toEqual
(
'failed Job #123 created 3 weeks ago by Foo'
);
});
});
});
});
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