Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/pages/groups/registry/repositories/index.js

-import initRegistryImages from '~/registry';
+import initRegistryImages from '~/registry/list';
 document.addEventListener('DOMContentLoaded', initRegistryImages);

app/assets/javascripts/pages/projects/registry/repositories/index.js

-import initRegistryImages from '~/registry/index';
+import initRegistryImages from '~/registry/list/index';
 document.addEventListener('DOMContentLoaded', initRegistryImages);

app/assets/javascripts/registry/components/app.vue → app/assets/javascripts/registry/list/components/app.vue

@@ -5,7 +5,7 @@ import store from '../stores';
 import CollapsibleContainer from './collapsible_container.vue';
 import ProjectEmptyState from './project_empty_state.vue';
 import GroupEmptyState from './group_empty_state.vue';
-import { s__, sprintf } from '../../locale';
+import { s__, sprintf } from '~/locale';
 export default {
   name: 'RegistryListApp',

app/assets/javascripts/registry/constants.js → app/assets/javascripts/registry/list/constants.js

-import { __ } from '../locale';
+import { __ } from '~/locale';
 export const FETCH_REGISTRY_ERROR_MESSAGE = __(
   'Something went wrong while fetching the registry list.',

app/assets/javascripts/registry/index.js → app/assets/javascripts/registry/list/index.js

 import Vue from 'vue';
 import registryApp from './components/app.vue';
-import Translate from '../vue_shared/translate';
+import Translate from '~/vue_shared/translate';
 Vue.use(Translate);

doc/user/project/repository/index.md

@@ -34,7 +34,7 @@ You can either use the user interface (UI), or connect your local computer
 with GitLab [through the command line](../../../gitlab-basics/command-line-commands.md#start-working-on-your-project).
 To configure [GitLab CI/CD](../../../ci/README.md) to build, test, and deploy
-you code, add a file called [`.gitlab-ci.yml`](../../../ci/quick_start/README.md)
+your code, add a file called [`.gitlab-ci.yml`](../../../ci/quick_start/README.md)
 to your repository's root.
 **From the user interface:**

package.json

@@ -38,7 +38,7 @@
     "@babel/plugin-syntax-import-meta": "^7.2.0",
     "@babel/preset-env": "^7.6.2",
     "@gitlab/svgs": "^1.82.0",
-    "@gitlab/ui": "7.16.1",
+    "@gitlab/ui": "8.0.1",
     "@gitlab/visual-review-tools": "1.2.0",
     "@sentry/browser": "^5.7.1",
     "@sourcegraph/code-host-integration": "^0.0.14",

spec/javascripts/diffs/components/compare_versions_spec.js → spec/frontend/diffs/components/compare_versions_spec.js

-import Vue from 'vue';
+import { trimText } from 'helpers/text_helper';
+import { mount, createLocalVue } from '@vue/test-utils';
+import Vuex from 'vuex';
 import CompareVersionsComponent from '~/diffs/components/compare_versions.vue';
+import Icon from '~/vue_shared/components/icon.vue';
 import { createStore } from '~/mr_notes/stores';
-import { createComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
 import diffsMockData from '../mock_data/merge_request_diffs';
 import getDiffWithCommit from '../mock_data/diff_with_commit';
+const localVue = createLocalVue();
+localVue.use(Vuex);
+
 describe('CompareVersions', () => {
-  let vm;
+  let wrapper;
   const targetBranch = { branchName: 'tmp-wine-dev', versionIndex: -1 };
-  beforeEach(() => {
+  const createWrapper = props => {
     const store = createStore();
     store.state.diffs.addedLines = 10;
     store.state.diffs.removedLines = 20;
     store.state.diffs.diffFiles.push('test');
-    vm = createComponentWithStore(Vue.extend(CompareVersionsComponent), store, {
-      mergeRequestDiffs: diffsMockData,
-      mergeRequestDiff: diffsMockData[0],
-      targetBranch,
-    }).$mount();
+    wrapper = mount(CompareVersionsComponent, {
+      sync: false,
+      attachToDocument: true,
+      localVue,
+      store,
+      propsData: {
+        mergeRequestDiffs: diffsMockData,
+        mergeRequestDiff: diffsMockData[0],
+        targetBranch,
+        ...props,
+      },
+    });
+  };
+
+  beforeEach(() => {
+    createWrapper();
+  });
+
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
   });
   describe('template', () => {
     it('should render Tree List toggle button with correct attribute values', () => {
-      const treeListBtn = vm.$el.querySelector('.js-toggle-tree-list');
-
-      expect(treeListBtn).not.toBeNull();
-      expect(treeListBtn.dataset.originalTitle).toBe('Hide file browser');
-      expect(treeListBtn.querySelectorAll('svg use').length).not.toBe(0);
-      expect(treeListBtn.querySelector('svg use').getAttribute('xlink:href')).toContain(
-        '#collapse-left',
-      );
+      const treeListBtn = wrapper.find('.js-toggle-tree-list');
+
+      expect(treeListBtn.exists()).toBe(true);
+      expect(treeListBtn.attributes('data-original-title')).toBe('Hide file browser');
+      expect(treeListBtn.findAll(Icon).length).not.toBe(0);
+      expect(treeListBtn.find(Icon).props('name')).toBe('collapse-left');
     });
     it('should render comparison dropdowns with correct values', () => {
-      const sourceDropdown = vm.$el.querySelector('.mr-version-dropdown');
-      const targetDropdown = vm.$el.querySelector('.mr-version-compare-dropdown');
-      expect(sourceDropdown).not.toBeNull();
-      expect(targetDropdown).not.toBeNull();
-      expect(sourceDropdown.querySelector('a span').innerHTML).toContain('latest version');
-      expect(targetDropdown.querySelector('a span').innerHTML).toContain(targetBranch.branchName);
+      const sourceDropdown = wrapper.find('.mr-version-dropdown');
+      const targetDropdown = wrapper.find('.mr-version-compare-dropdown');
+      expect(sourceDropdown.exists()).toBe(true);
+      expect(targetDropdown.exists()).toBe(true);
+      expect(sourceDropdown.find('a span').html()).toContain('latest version');
+      expect(targetDropdown.find('a span').html()).toContain(targetBranch.branchName);
     });
     it('should not render comparison dropdowns if no mergeRequestDiffs are specified', () => {
-      vm.mergeRequestDiffs = [];
-      vm.$nextTick(() => {
-        const sourceDropdown = vm.$el.querySelector('.mr-version-dropdown');
-        const targetDropdown = vm.$el.querySelector('.mr-version-compare-dropdown');
-        expect(sourceDropdown).toBeNull();
-        expect(targetDropdown).toBeNull();
-      });
+      createWrapper({ mergeRequestDiffs: [] });
+      const sourceDropdown = wrapper.find('.mr-version-dropdown');
+      const targetDropdown = wrapper.find('.mr-version-compare-dropdown');
+      expect(sourceDropdown.exists()).toBe(false);
+      expect(targetDropdown.exists()).toBe(false);
     });
     it('should render view types buttons with correct values', () => {
-      const inlineBtn = vm.$el.querySelector('#inline-diff-btn');
-      const parallelBtn = vm.$el.querySelector('#parallel-diff-btn');
-
-      expect(inlineBtn).not.toBeNull();
-      expect(parallelBtn).not.toBeNull();
-      expect(inlineBtn.dataset.viewType).toEqual('inline');
-      expect(parallelBtn.dataset.viewType).toEqual('parallel');
-      expect(inlineBtn.innerHTML).toContain('Inline');
-      expect(parallelBtn.innerHTML).toContain('Side-by-side');
+      const inlineBtn = wrapper.find('#inline-diff-btn');
+      const parallelBtn = wrapper.find('#parallel-diff-btn');
+
+      expect(inlineBtn.exists()).toBe(true);
+      expect(parallelBtn.exists()).toBe(true);
+      expect(inlineBtn.attributes('data-view-type')).toEqual('inline');
+      expect(parallelBtn.attributes('data-view-type')).toEqual('parallel');
+      expect(inlineBtn.html()).toContain('Inline');
+      expect(parallelBtn.html()).toContain('Side-by-side');
     });
     it('adds container-limiting classes when showFileTree is false with inline diffs', () => {
-      vm.isLimitedContainer = true;
-      vm.$nextTick(() => {
-        const limitedContainer = vm.$el.querySelector('.container-limited.limit-container-width');
-        expect(limitedContainer).not.toBeNull();
-      });
+      createWrapper({ isLimitedContainer: true });
+      const limitedContainer = wrapper.find('.container-limited.limit-container-width');
+      expect(limitedContainer.exists()).toBe(true);
     });
     it('does not add container-limiting classes when showFileTree is false with inline diffs', () => {
-      vm.isLimitedContainer = false;
-      vm.$nextTick(() => {
-        const limitedContainer = vm.$el.querySelector('.container-limited.limit-container-width');
-        expect(limitedContainer).toBeNull();
-      });
+      createWrapper({ isLimitedContainer: false });
+      const limitedContainer = wrapper.find('.container-limited.limit-container-width');
+      expect(limitedContainer.exists()).toBe(false);
     });
   });
   describe('setInlineDiffViewType', () => {
     it('should persist the view type in the url', () => {
-      const viewTypeBtn = vm.$el.querySelector('#inline-diff-btn');
-      viewTypeBtn.click();
+      const viewTypeBtn = wrapper.find('#inline-diff-btn');
+      viewTypeBtn.trigger('click');
       expect(window.location.toString()).toContain('?view=inline');
     });
@@ -101,8 +114,8 @@ describe('CompareVersions', () => {
   describe('setParallelDiffViewType', () => {
     it('should persist the view type in the url', () => {
-      const viewTypeBtn = vm.$el.querySelector('#parallel-diff-btn');
-      viewTypeBtn.click();
+      const viewTypeBtn = wrapper.find('#parallel-diff-btn');
+      viewTypeBtn.trigger('click');
       expect(window.location.toString()).toContain('?view=parallel');
     });
@@ -110,7 +123,7 @@ describe('CompareVersions', () => {
   describe('comparableDiffs', () => {
     it('should not contain the first item in the mergeRequestDiffs property', () => {
-      const { comparableDiffs } = vm;
+      const { comparableDiffs } = wrapper.vm;
       const comparableDiffsMock = diffsMockData.slice(1);
       expect(comparableDiffs).toEqual(comparableDiffsMock);
@@ -119,27 +132,25 @@ describe('CompareVersions', () => {
   describe('baseVersionPath', () => {
     it('should be set correctly from mergeRequestDiff', () => {
-      expect(vm.baseVersionPath).toEqual(vm.mergeRequestDiff.base_version_path);
+      expect(wrapper.vm.baseVersionPath).toEqual(wrapper.vm.mergeRequestDiff.base_version_path);
     });
   });
   describe('commit', () => {
     beforeEach(done => {
-      vm.$store.state.diffs.commit = getDiffWithCommit().commit;
-      vm.mergeRequestDiffs = [];
-      vm.$nextTick(done);
+      wrapper.vm.$store.state.diffs.commit = getDiffWithCommit().commit;
+      wrapper.mergeRequestDiffs = [];
+      wrapper.vm.$nextTick(done);
     });
     it('renders latest version button', () => {
-      expect(vm.$el.querySelector('.js-latest-version').textContent.trim()).toBe(
-        'Show latest version',
-      );
+      expect(trimText(wrapper.find('.js-latest-version').text())).toBe('Show latest version');
     });
     it('renders short commit ID', () => {
-      expect(vm.$el.textContent).toContain('Viewing commit');
-      expect(vm.$el.textContent).toContain(vm.commit.short_id);
+      expect(wrapper.text()).toContain('Viewing commit');
+      expect(wrapper.text()).toContain(wrapper.vm.commit.short_id);
     });
   });
 });

spec/frontend/diffs/mock_data/diff_with_commit.js

+const FIXTURE = 'merge_request_diffs/with_commit.json';
+
+preloadFixtures(FIXTURE);
+
+export default function getDiffWithCommit() {
+  return getJSONFixture(FIXTURE);
+}

spec/frontend/diffs/mock_data/merge_request_diffs.js

+export default [
+  {
+    base_version_path: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=37',
+    version_index: 4,
+    created_at: '2018-10-23T11:49:16.611Z',
+    commits_count: 4,
+    latest: true,
+    short_commit_sha: 'de7a8f7f',
+    version_path: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=37',
+    compare_path:
+      '/gnuwget/wget2/merge_requests/6/diffs?diff_id=37&start_sha=de7a8f7f20c3ea2e0bef3ba01cfd41c21f6b4995',
+  },
+  {
+    base_version_path: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=36',
+    version_index: 3,
+    created_at: '2018-10-23T11:46:40.617Z',
+    commits_count: 3,
+    latest: false,
+    short_commit_sha: 'e78fc18f',
+    version_path: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=36',
+    compare_path:
+      '/gnuwget/wget2/merge_requests/6/diffs?diff_id=37&start_sha=e78fc18fa37acb2185c59ca94d4a964464feb50e',
+  },
+  {
+    base_version_path: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=35',
+    version_index: 2,
+    created_at: '2018-10-04T09:57:39.648Z',
+    commits_count: 2,
+    latest: false,
+    short_commit_sha: '48da7e7e',
+    version_path: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=35',
+    compare_path:
+      '/gnuwget/wget2/merge_requests/6/diffs?diff_id=37&start_sha=48da7e7e9a99d41c852578bd9cb541ca4d864b3e',
+  },
+  {
+    base_version_path: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=20',
+    version_index: 1,
+    created_at: '2018-09-25T20:30:39.493Z',
+    commits_count: 1,
+    latest: false,
+    short_commit_sha: '47bac2ed',
+    version_path: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=20',
+    compare_path:
+      '/gnuwget/wget2/merge_requests/6/diffs?diff_id=37&start_sha=47bac2ed972c5bee344c1cea159a22cd7f711dc0',
+  },
+];