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

6346b7f6 · Lukas Eipert · 31ce3e81 · 6346b7f6
Commit 6346b7f6 authored Jul 30, 2018 by Lukas Eipert
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 10 deletions

spec/javascripts/pipelines/graph/stage_column_component_spec.js ...avascripts/pipelines/graph/stage_column_component_spec.js +2 -10

No files found.
--- a/spec/javascripts/pipelines/graph/stage_column_component_spec.js
+++ b/spec/javascripts/pipelines/graph/stage_column_component_spec.js
@@ -33,20 +33,11 @@ describe('stage column component', () => {
      mockJobs.push(mockedJob);
    }

-<<<<<<< HEAD
-    component = new StageColumnComponent({
-      propsData: {
-        title: 'foo',
-        jobs: mockJobs,
-        hasTriggeredBy: false,
-      },
-    }).$mount();
-=======
    component = mountComponent(StageColumnComponent, {
      title: 'foo',
      jobs: mockJobs,
+      hasTriggeredBy: false,
    });
->>>>>>> upstream/master
  });

  it('should render provided title', () => {
@@ -72,6 +63,7 @@ describe('stage column component', () => {
          },
        ],
        title: 'test',
+        hasTriggeredBy: false,
      });

      expect(