Add latest changes from gitlab-org/gitlab@master

3 files changed, 122 insertions, 1 deletions

diff --git a/spec/frontend/create_cluster/gke_cluster/components/gke_zone_dropdown_spec.js b/spec/frontend/create_cluster/gke_cluster/components/gke_zone_dropdown_spec.js
new file mode 100644
index 00000000000..c07e3f81964
--- /dev/null
+++ b/spec/frontend/create_cluster/gke_cluster/components/gke_zone_dropdown_spec.js
@@ -0,0 +1,101 @@
+import { shallowMount } from '@vue/test-utils';
+import GkeZoneDropdown from '~/create_cluster/gke_cluster/components/gke_zone_dropdown.vue';
+import DropdownHiddenInput from '~/vue_shared/components/dropdown/dropdown_hidden_input.vue';
+import DropdownButton from '~/vue_shared/components/dropdown/dropdown_button.vue';
+import { createStore } from '~/create_cluster/gke_cluster/store';
+import {
+  SET_PROJECT,
+  SET_ZONES,
+  SET_PROJECT_BILLING_STATUS,
+} from '~/create_cluster/gke_cluster/store/mutation_types';
+import { selectedZoneMock, selectedProjectMock, gapiZonesResponseMock } from '../mock_data';
+
+const propsData = {
+  fieldId: 'cluster_provider_gcp_attributes_gcp_zone',
+  fieldName: 'cluster[provider_gcp_attributes][gcp_zone]',
+};
+
+const LABELS = {
+  LOADING: 'Fetching zones',
+  DISABLED: 'Select project to choose zone',
+  DEFAULT: 'Select zone',
+};
+
+describe('GkeZoneDropdown', () => {
+  let store;
+  let wrapper;
+
+  beforeEach(() => {
+    store = createStore();
+    wrapper = shallowMount(GkeZoneDropdown, { propsData, store });
+  });
+
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
+  describe('toggleText', () => {
+    let dropdownButton;
+
+    beforeEach(() => {
+      dropdownButton = wrapper.find(DropdownButton);
+    });
+
+    it('returns disabled state toggle text', () => {
+      expect(dropdownButton.props('toggleText')).toBe(LABELS.DISABLED);
+    });
+
+    describe('isLoading', () => {
+      beforeEach(() => {
+        wrapper.setData({ isLoading: true });
+        return wrapper.vm.$nextTick();
+      });
+
+      it('returns loading toggle text', () => {
+        expect(dropdownButton.props('toggleText')).toBe(LABELS.LOADING);
+      });
+    });
+
+    describe('project is set', () => {
+      beforeEach(() => {
+        wrapper.vm.$store.commit(SET_PROJECT, selectedProjectMock);
+        wrapper.vm.$store.commit(SET_PROJECT_BILLING_STATUS, true);
+        return wrapper.vm.$nextTick();
+      });
+
+      it('returns default toggle text', () => {
+        expect(dropdownButton.props('toggleText')).toBe(LABELS.DEFAULT);
+      });
+    });
+
+    describe('project is selected', () => {
+      beforeEach(() => {
+        wrapper.vm.setItem(selectedZoneMock);
+        return wrapper.vm.$nextTick();
+      });
+
+      it('returns project name if project selected', () => {
+        expect(dropdownButton.props('toggleText')).toBe(selectedZoneMock);
+      });
+    });
+  });
+
+  describe('selectItem', () => {
+    beforeEach(() => {
+      wrapper.vm.$store.commit(SET_ZONES, gapiZonesResponseMock.items);
+      return wrapper.vm.$nextTick();
+    });
+
+    it('reflects new value when dropdown item is clicked', () => {
+      const dropdown = wrapper.find(DropdownHiddenInput);
+
+      expect(dropdown.attributes('value')).toBe('');
+
+      wrapper.find('.dropdown-content button').trigger('click');
+
+      return wrapper.vm.$nextTick().then(() => {
+        expect(dropdown.attributes('value')).toBe(selectedZoneMock);
+      });
+    });
+  });
+});
diff --git a/spec/frontend/repository/components/breadcrumbs_spec.js b/spec/frontend/repository/components/breadcrumbs_spec.js
index 0271db25468..38e5c9aaca5 100644
--- a/spec/frontend/repository/components/breadcrumbs_spec.js
+++ b/spec/frontend/repository/components/breadcrumbs_spec.js
@@ -41,7 +41,7 @@ describe('Repository breadcrumbs component', () => {
         .findAll(RouterLinkStub)
         .at(3)
         .props('to'),
-    ).toEqual('/-/tree//app/assets/javascripts%23');
+    ).toEqual('/-/tree/app/assets/javascripts%23');
   });
 
   it('renders last link as active', () => {
diff --git a/spec/frontend/repository/components/table/row_spec.js b/spec/frontend/repository/components/table/row_spec.js
index fec9ba3aa2e..a51846023ac 100644
--- a/spec/frontend/repository/components/table/row_spec.js
+++ b/spec/frontend/repository/components/table/row_spec.js
@@ -109,6 +109,26 @@ describe('Repository table row component', () => {
     });
   });
 
+  it.each`
+    path
+    ${'test#'}
+    ${'Änderungen'}
+  `('renders link for $path', ({ path }) => {
+    factory({
+      id: '1',
+      sha: '123',
+      path,
+      type: 'tree',
+      currentPath: '/',
+    });
+
+    return vm.vm.$nextTick().then(() => {
+      expect(vm.find({ ref: 'link' }).props('to')).toEqual({
+        path: `/-/tree/master/${encodeURIComponent(path)}`,
+      });
+    });
+  });
+
   it('pushes new route for directory with hash', () => {
     factory({
       id: '1',