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

Merge branch 'revert-018f7e46' into 'master'

Browse source 
Revert "Merge branch 'winh-mr-widget-no-pipeline' into 'master'"

See merge request !12674
This commit is contained in:
Phil Hughes 2017-07-06 13:14:33 +00:00
commit bb918a2fd9
2 changed files with 19 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js
View file

@ -17,9 +17,6 @@ export default {
return hasCI && !ciStatus;
},
hasPipeline() {
return Object.keys(this.mr.pipeline || {}).length > 0;
},
svg() {
return statusIconEntityMap.icon_status_failed;
},
@ -33,11 +30,7 @@ export default {
template: `
<div class="mr-widget-heading">
<div class="ci-widget">
<template v-if="!hasPipeline">
<i class="fa fa-spinner fa-spin append-right-10" aria-hidden="true"></i>
Waiting for pipeline...
</template>
<template v-else-if="hasCIError">
<template v-if="hasCIError">
<div class="ci-status-icon ci-status-icon-failed ci-error js-ci-error">
<span class="js-icon-link icon-link">
<span

66
spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js
View file

@ -76,28 +76,6 @@ describe('MRWidgetPipeline', () => {
el = vm.$el;
});
afterEach(() => {
vm.$destroy();
});
describe('without a pipeline', () => {
beforeEach(() => {
vm.mr = { pipeline: null };
});
it('should render message with spinner', (done) => {
Vue.nextTick()
.then(() => {
expect(el.querySelector('.pipeline-id')).toBe(null);
expect(el.innerText.trim()).toBe('Waiting for pipeline...');
expect(el.querySelectorAll('i.fa.fa-spinner.fa-spin').length).toBe(1);
done();
})
.then(done)
.catch(done.fail);
});
});
it('should render template elements correctly', () => {
expect(el.classList.contains('mr-widget-heading')).toBeTruthy();
expect(el.querySelectorAll('.ci-status-icon.ci-status-icon-success').length).toEqual(1);
@ -115,47 +93,39 @@ describe('MRWidgetPipeline', () => {
it('should list single stage', (done) => {
pipeline.details.stages.splice(0, 1);
Vue.nextTick()
.then(() => {
expect(el.querySelectorAll('.stage-container button').length).toEqual(1);
expect(el.innerText).toContain('with stage');
})
.then(done)
.catch(done.fail);
Vue.nextTick(() => {
expect(el.querySelectorAll('.stage-container button').length).toEqual(1);
expect(el.innerText).toContain('with stage');
done();
});
});
it('should not have stages when there is no stage', (done) => {
vm.mr.pipeline.details.stages = [];
Vue.nextTick()
.then(() => {
expect(el.querySelectorAll('.stage-container button').length).toEqual(0);
})
.then(done)
.catch(done.fail);
Vue.nextTick(() => {
expect(el.querySelectorAll('.stage-container button').length).toEqual(0);
done();
});
});
it('should not have coverage text when pipeline has no coverage info', (done) => {
vm.mr.pipeline.coverage = null;
Vue.nextTick()
.then(() => {
expect(el.querySelector('.js-mr-coverage')).toEqual(null);
})
.then(done)
.catch(done.fail);
Vue.nextTick(() => {
expect(el.querySelector('.js-mr-coverage')).toEqual(null);
done();
});
});
it('should show CI error when there is a CI error', (done) => {
vm.mr.ciStatus = null;
Vue.nextTick()
.then(() => {
expect(el.querySelectorAll('.js-ci-error').length).toEqual(1);
expect(el.innerText).toContain('Could not connect to the CI server');
})
.then(done)
.catch(done.fail);
Vue.nextTick(() => {
expect(el.querySelectorAll('.js-ci-error').length).toEqual(1);
expect(el.innerText).toContain('Could not connect to the CI server');
done();
});
});
});
});