Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 37 deletions

diff --git a/spec/javascripts/ide/components/external_link_spec.js b/spec/javascripts/ide/components/external_link_spec.js
deleted file mode 100644
index b3d94c041fa..00000000000
--- a/spec/javascripts/ide/components/external_link_spec.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import Vue from 'vue';
-import externalLink from '~/ide/components/external_link.vue';
-import createVueComponent from '../../helpers/vue_mount_component_helper';
-import { file } from '../helpers';
-
-describe('ExternalLink', () => {
-  const activeFile = file();
-  let vm;
-
-  function createComponent() {
-    const ExternalLink = Vue.extend(externalLink);
-
-    activeFile.permalink = 'test';
-
-    return createVueComponent(ExternalLink, {
-      file: activeFile,
-    });
-  }
-
-  afterEach(() => {
-    vm.$destroy();
-  });
-
-  it('renders the external link with the correct href', done => {
-    activeFile.binary = true;
-    vm = createComponent();
-
-    vm.$nextTick(() => {
-      const openLink = vm.$el.querySelector('a');
-
-      expect(openLink.href).toMatch(`/${activeFile.permalink}`);
-      done();
-    });
-  });
-});
diff --git a/spec/javascripts/pipelines/graph/graph_component_spec.js b/spec/javascripts/pipelines/graph/graph_component_spec.js
index fa6a5f57410..d2c10362ba3 100644
--- a/spec/javascripts/pipelines/graph/graph_component_spec.js
+++ b/spec/javascripts/pipelines/graph/graph_component_spec.js
@@ -159,7 +159,6 @@ describe('graph component', () => {
 
             expect(component.$emit).toHaveBeenCalledWith(
               'onClickTriggeredBy',
-              component.pipeline,
               component.pipeline.triggered_by[0],
             );
           });
@@ -196,7 +195,6 @@ describe('graph component', () => {
 
             expect(component.$emit).toHaveBeenCalledWith(
               'onClickTriggered',
-              component.pipeline,
               component.pipeline.triggered[0],
             );
           });