Add latest changes from gitlab-org/gitlab@master

5 files changed, 14 insertions, 34 deletions

diff --git a/spec/javascripts/badges/components/badge_form_spec.js b/spec/javascripts/badges/components/badge_form_spec.js
index 651ac3ba3f9..b40afc40ca0 100644
--- a/spec/javascripts/badges/components/badge_form_spec.js
+++ b/spec/javascripts/badges/components/badge_form_spec.js
@@ -51,13 +51,14 @@ describe('BadgeForm component', () => {
   });
 
   const sharedSubmitTests = submitAction => {
+    const nameSelector = '#badge-name';
     const imageUrlSelector = '#badge-image-url';
     const findImageUrlElement = () => vm.$el.querySelector(imageUrlSelector);
     const linkUrlSelector = '#badge-link-url';
     const findLinkUrlElement = () => vm.$el.querySelector(linkUrlSelector);
-    const setValue = (inputElementSelector, url) => {
+    const setValue = (inputElementSelector, value) => {
       const inputElement = vm.$el.querySelector(inputElementSelector);
-      inputElement.value = url;
+      inputElement.value = value;
       inputElement.dispatchEvent(new Event('input'));
     };
     const submitForm = () => {
@@ -82,6 +83,7 @@ describe('BadgeForm component', () => {
         isSaving: false,
       });
 
+      setValue(nameSelector, 'TestBadge');
       setValue(linkUrlSelector, `${TEST_HOST}/link/url`);
       setValue(imageUrlSelector, `${window.location.origin}${DUMMY_IMAGE_URL}`);
     });
diff --git a/spec/javascripts/badges/components/badge_list_row_spec.js b/spec/javascripts/badges/components/badge_list_row_spec.js
index a5b47cc5f32..34a92cc2018 100644
--- a/spec/javascripts/badges/components/badge_list_row_spec.js
+++ b/spec/javascripts/badges/components/badge_list_row_spec.js
@@ -39,6 +39,10 @@ describe('BadgeListRow component', () => {
     expect(badgeElement.getAttribute('src')).toBe(badge.renderedImageUrl);
   });
 
+  it('renders the badge name', () => {
+    expect(vm.$el).toContainText(badge.name);
+  });
+
   it('renders the badge link', () => {
     expect(vm.$el).toContainText(badge.linkUrl);
   });
diff --git a/spec/javascripts/badges/dummy_badge.js b/spec/javascripts/badges/dummy_badge.js
index f0cdaddbd33..ffc21c960b9 100644
--- a/spec/javascripts/badges/dummy_badge.js
+++ b/spec/javascripts/badges/dummy_badge.js
@@ -6,6 +6,7 @@ export const createDummyBadge = () => {
   const id = _.uniqueId();
   return {
     id,
+    name: 'TestBadge',
     imageUrl: `${TEST_HOST}/badges/${id}/image/url`,
     isDeleting: false,
     linkUrl: `${TEST_HOST}/badges/${id}/link/url`,
@@ -16,6 +17,7 @@ export const createDummyBadge = () => {
 };
 
 export const createDummyBadgeResponse = () => ({
+  name: 'TestBadge',
   image_url: `${TEST_HOST}/badge/image/url`,
   link_url: `${TEST_HOST}/badge/link/url`,
   kind: PROJECT_BADGE,
diff --git a/spec/javascripts/badges/store/actions_spec.js b/spec/javascripts/badges/store/actions_spec.js
index e8d5f8c3aac..a4cdff8129d 100644
--- a/spec/javascripts/badges/store/actions_spec.js
+++ b/spec/javascripts/badges/store/actions_spec.js
@@ -90,6 +90,7 @@ describe('Badges store actions', () => {
       endpointMock.replyOnce(req => {
         expect(req.data).toBe(
           JSON.stringify({
+            name: 'TestBadge',
             image_url: badgeInAddForm.imageUrl,
             link_url: badgeInAddForm.linkUrl,
           }),
@@ -114,6 +115,7 @@ describe('Badges store actions', () => {
       endpointMock.replyOnce(req => {
         expect(req.data).toBe(
           JSON.stringify({
+            name: 'TestBadge',
             image_url: badgeInAddForm.imageUrl,
             link_url: badgeInAddForm.linkUrl,
           }),
@@ -526,6 +528,7 @@ describe('Badges store actions', () => {
       endpointMock.replyOnce(req => {
         expect(req.data).toBe(
           JSON.stringify({
+            name: 'TestBadge',
             image_url: badgeInEditForm.imageUrl,
             link_url: badgeInEditForm.linkUrl,
           }),
@@ -550,6 +553,7 @@ describe('Badges store actions', () => {
       endpointMock.replyOnce(req => {
         expect(req.data).toBe(
           JSON.stringify({
+            name: 'TestBadge',
             image_url: badgeInEditForm.imageUrl,
             link_url: badgeInEditForm.linkUrl,
           }),
diff --git a/spec/javascripts/vue_shared/components/expand_button_spec.js b/spec/javascripts/vue_shared/components/expand_button_spec.js
deleted file mode 100644
index 2af4abc299a..00000000000
--- a/spec/javascripts/vue_shared/components/expand_button_spec.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import Vue from 'vue';
-import expandButton from '~/vue_shared/components/expand_button.vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
-
-describe('expand button', () => {
-  const Component = Vue.extend(expandButton);
-  let vm;
-
-  beforeEach(() => {
-    vm = mountComponent(Component, {
-      slots: {
-        expanded: '<p>Expanded!</p>',
-      },
-    });
-  });
-
-  afterEach(() => {
-    vm.$destroy();
-  });
-
-  it('renders a collapsed button', () => {
-    expect(vm.$children[0].iconTestClass).toEqual('ic-ellipsis_h');
-  });
-
-  it('hides expander on click', done => {
-    vm.$el.querySelector('button').click();
-    vm.$nextTick(() => {
-      expect(vm.$el.querySelector('button').getAttribute('style')).toEqual('display: none;');
-      done();
-    });
-  });
-});