Skip to content

G
gitlab-ce
Commit 6346b7f6 authored by Lukas Eipert's avatar Lukas Eipert
Browse files
Options

resolve conflict in spec/javascripts/pipelines/graph/stage_column_component_spec.js

parent 31ce3e81
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 10 deletions
spec/javascripts/pipelines/graph/stage_column_component_spec.js
View file @ 6346b7f6
...@@ -33,20 +33,11 @@ describe('stage column component', () => { ...@@ -33,20 +33,11 @@ describe('stage column component', () => {
mockJobs.push(mockedJob); mockJobs.push(mockedJob);
} }
<<<<<<< HEAD
component = new StageColumnComponent({
propsData: {
title: 'foo',
jobs: mockJobs,
hasTriggeredBy: false,
},
}).$mount();
=======
component = mountComponent(StageColumnComponent, { component = mountComponent(StageColumnComponent, {
title: 'foo', title: 'foo',
jobs: mockJobs, jobs: mockJobs,
hasTriggeredBy: false,
}); });
>>>>>>> upstream/master
}); });
it('should render provided title', () => { it('should render provided title', () => {
...@@ -72,6 +63,7 @@ describe('stage column component', () => { ...@@ -72,6 +63,7 @@ describe('stage column component', () => {
}, },
], ],
title: 'test', title: 'test',
hasTriggeredBy: false,
}); });
expect( expect(
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7