Add latest changes from gitlab-org/gitlab@master

2 files changed, 101 insertions, 20 deletions

diff --git a/spec/frontend/integrations/edit/components/sections/google_play_spec.js b/spec/frontend/integrations/edit/components/sections/google_play_spec.js
new file mode 100644
index 00000000000..c0d6d17f639
--- /dev/null
+++ b/spec/frontend/integrations/edit/components/sections/google_play_spec.js
@@ -0,0 +1,54 @@
+import { shallowMount } from '@vue/test-utils';
+
+import IntegrationSectionGooglePlay from '~/integrations/edit/components/sections/google_play.vue';
+import UploadDropzoneField from '~/integrations/edit/components/upload_dropzone_field.vue';
+import { createStore } from '~/integrations/edit/store';
+
+describe('IntegrationSectionGooglePlay', () => {
+  let wrapper;
+
+  const createComponent = (fileName = '') => {
+    const store = createStore({
+      customState: {
+        fields: [
+          {
+            name: 'service_account_key_file_name',
+            value: fileName,
+          },
+        ],
+      },
+    });
+
+    wrapper = shallowMount(IntegrationSectionGooglePlay, {
+      store,
+    });
+  };
+
+  const findUploadDropzoneField = () => wrapper.findComponent(UploadDropzoneField);
+
+  describe('computed properties', () => {
+    it('renders UploadDropzoneField with default values', () => {
+      createComponent();
+
+      const field = findUploadDropzoneField();
+
+      expect(field.exists()).toBe(true);
+      expect(field.props()).toMatchObject({
+        label: 'Service account key (.json)',
+        helpText: '',
+      });
+    });
+
+    it('renders UploadDropzoneField with custom values for an attached file', () => {
+      createComponent('fileName.txt');
+
+      const field = findUploadDropzoneField();
+
+      expect(field.exists()).toBe(true);
+      expect(field.props()).toMatchObject({
+        label: 'Upload a new service account key (replace fileName.txt)',
+        helpText: 'Leave empty to use your current service account key.',
+      });
+    });
+  });
+});
diff --git a/spec/frontend/notes/components/note_edited_text_spec.js b/spec/frontend/notes/components/note_edited_text_spec.js
index 0a5fe48ef94..e76a1de0a66 100644
--- a/spec/frontend/notes/components/note_edited_text_spec.js
+++ b/spec/frontend/notes/components/note_edited_text_spec.js
@@ -1,3 +1,4 @@
+import { GlSprintf, GlLink } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import NoteEditedText from '~/notes/components/note_edited_text.vue';
 
@@ -5,41 +6,67 @@ const propsData = {
   actionText: 'Edited',
   className: 'foo-bar',
   editedAt: '2017-08-04T09:52:31.062Z',
-  editedBy: {
-    avatar_url: 'path',
-    id: 1,
-    name: 'Root',
-    path: '/root',
-    state: 'active',
-    username: 'root',
-  },
+  editedBy: null,
 };
 
 describe('NoteEditedText', () => {
   let wrapper;
 
-  beforeEach(() => {
+  const createWrapper = (props = {}) => {
     wrapper = shallowMount(NoteEditedText, {
-      propsData,
+      propsData: {
+        ...propsData,
+        ...props,
+      },
+      stubs: {
+        GlSprintf,
+      },
     });
-  });
+  };
+
+  const findUserElement = () => wrapper.findComponent(GlLink);
 
   afterEach(() => {
     wrapper.destroy();
   });
 
-  it('should render block with provided className', () => {
-    expect(wrapper.classes()).toContain(propsData.className);
-  });
+  describe('default', () => {
+    beforeEach(() => {
+      createWrapper();
+    });
 
-  it('should render provided actionText', () => {
-    expect(wrapper.text().trim()).toContain(propsData.actionText);
+    it('should render block with provided className', () => {
+      expect(wrapper.classes()).toContain(propsData.className);
+    });
+
+    it('should render provided actionText', () => {
+      expect(wrapper.text().trim()).toContain(propsData.actionText);
+    });
+
+    it('should not render user information', () => {
+      expect(findUserElement().exists()).toBe(false);
+    });
   });
 
-  it('should render provided user information', () => {
-    const authorLink = wrapper.find('.js-user-link');
+  describe('edited note', () => {
+    const editedBy = {
+      avatar_url: 'path',
+      id: 1,
+      name: 'Root',
+      path: '/root',
+      state: 'active',
+      username: 'root',
+    };
+
+    beforeEach(() => {
+      createWrapper({ editedBy });
+    });
+
+    it('should render user information', () => {
+      const authorLink = findUserElement();
 
-    expect(authorLink.attributes('href')).toEqual(propsData.editedBy.path);
-    expect(authorLink.text().trim()).toEqual(propsData.editedBy.name);
+      expect(authorLink.attributes('href')).toEqual(editedBy.path);
+      expect(authorLink.text().trim()).toEqual(editedBy.name);
+    });
   });
 });