Add latest changes from gitlab-org/gitlab@master

1 files changed, 20 insertions, 1 deletions

diff --git a/spec/frontend/repository/components/blob_header_edit_spec.js b/spec/frontend/repository/components/blob_header_edit_spec.js
index bd02bbe65d9..c0eb7c523c4 100644
--- a/spec/frontend/repository/components/blob_header_edit_spec.js
+++ b/spec/frontend/repository/components/blob_header_edit_spec.js
@@ -1,6 +1,7 @@
 import { GlButton } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import BlobHeaderEdit from '~/repository/components/blob_header_edit.vue';
+import WebIdeLink from '~/vue_shared/components/web_ide_link.vue';
 
 const DEFAULT_PROPS = {
   editPath: 'some_file.js/edit',
@@ -10,12 +11,17 @@ const DEFAULT_PROPS = {
 describe('BlobHeaderEdit component', () => {
   let wrapper;
 
-  const createComponent = (props = {}) => {
+  const createComponent = (consolidatedEditButton = false, props = {}) => {
     wrapper = shallowMount(BlobHeaderEdit, {
       propsData: {
         ...DEFAULT_PROPS,
         ...props,
       },
+      provide: {
+        glFeatures: {
+          consolidatedEditButton,
+        },
+      },
     });
   };
 
@@ -27,6 +33,7 @@ describe('BlobHeaderEdit component', () => {
   const findButtons = () => wrapper.findAll(GlButton);
   const findEditButton = () => findButtons().at(0);
   const findWebIdeButton = () => findButtons().at(1);
+  const findWebIdeLink = () => wrapper.find(WebIdeLink);
 
   it('renders component', () => {
     createComponent();
@@ -60,4 +67,16 @@ describe('BlobHeaderEdit component', () => {
     expect(findWebIdeButton().text()).toBe('Web IDE');
     expect(findWebIdeButton()).not.toBeDisabled();
   });
+
+  it('renders WebIdeLink component', () => {
+    createComponent(true);
+
+    const { editPath: editUrl, webIdePath: webIdeUrl } = DEFAULT_PROPS;
+
+    expect(findWebIdeLink().props()).toMatchObject({
+      editUrl,
+      webIdeUrl,
+      isBlob: true,
+    });
+  });
 });