kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix boolean prop being provided as string

Browse source
This commit is contained in:
Filipa Lacerda 2018-01-11 19:07:42 +00:00
parent 34760245bc
commit dddd261c34
No known key found for this signature in database
GPG key ID: 9CA3FDE4D1E2F1C8
2 changed files with 31 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/jobs/components/header.vue
View file

@ -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: {

34
spec/javascripts/jobs/header_spec.js
View file

@ -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,15 +44,32 @@ describe('Job details header', () => {
vm.$destroy(); vm.$destroy();
}); });
it('should render provided job information', () => { describe('triggered job', () => {
expect( beforeEach(() => {
vm.$el.querySelector('.header-main-content').textContent.replace(/\s+/g, ' ').trim(), vm = mountComponent(HeaderComponent, props);
).toEqual('failed Job #123 triggered 3 weeks ago by Foo'); });
it('should render provided job information', () => {
expect(
vm.$el.querySelector('.header-main-content').textContent.replace(/\s+/g, ' ').trim(),
).toEqual('failed Job #123 triggered 3 weeks ago by Foo');
});
it('should render new issue link', () => {
expect(
vm.$el.querySelector('.js-new-issue').getAttribute('href'),
).toEqual(props.job.new_issue_path);
});
}); });
it('should render new issue link', () => { describe('created job', () => {
expect( it('should render created key', () => {
vm.$el.querySelector('.js-new-issue').getAttribute('href'), props.job.started = false;
).toEqual(props.job.new_issue_path); 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');
});
}); });
}); });