Commit 6329ef28 authored by Luke Bennett's avatar Luke Bennett

Fix karma

parent 09202a46
...@@ -42,13 +42,13 @@ export default { ...@@ -42,13 +42,13 @@ export default {
const { pipeline, isPipelineActive, isPipelineFailed, hasCI, ciStatus } = this.mr; const { pipeline, isPipelineActive, isPipelineFailed, hasCI, ciStatus } = this.mr;
if (hasCI && !ciStatus) { if (hasCI && !ciStatus) {
return 'warning'; return 'failed';
} else if (!pipeline) { } else if (!pipeline) {
return 'success'; return 'success';
} else if (isPipelineActive) { } else if (isPipelineActive) {
return 'pending'; return 'pending';
} else if (isPipelineFailed) { } else if (isPipelineFailed) {
return 'warning'; return 'failed';
} }
return 'success'; return 'success';
......
...@@ -36,7 +36,7 @@ const createComponent = (customConfig = {}) => { ...@@ -36,7 +36,7 @@ const createComponent = (customConfig = {}) => {
}); });
}; };
describe('MRWidgetReadyToMerge', () => { fdescribe('MRWidgetReadyToMerge', () => {
let vm; let vm;
beforeEach(() => { beforeEach(() => {
...@@ -170,14 +170,14 @@ describe('MRWidgetReadyToMerge', () => { ...@@ -170,14 +170,14 @@ describe('MRWidgetReadyToMerge', () => {
expect(vm.iconClass).toEqual('success'); expect(vm.iconClass).toEqual('success');
}); });
it('shows x for failed status', () => { it('shows warning icon for failed status', () => {
vm.mr.hasCI = true; vm.mr.hasCI = true;
expect(vm.iconClass).toEqual('failed'); expect(vm.iconClass).toEqual('warning');
}); });
it('shows x for merge not allowed', () => { it('shows warning icon for merge not allowed', () => {
vm.mr.hasCI = true; vm.mr.hasCI = true;
expect(vm.iconClass).toEqual('failed'); expect(vm.iconClass).toEqual('warning');
}); });
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment