Add latest changes from gitlab-org/gitlab@master

7 files changed, 19 insertions, 205 deletions

diff --git a/spec/javascripts/boards/board_list_common_spec.js b/spec/javascripts/boards/board_list_common_spec.js
index ada7589b795..a92d885790d 100644
--- a/spec/javascripts/boards/board_list_common_spec.js
+++ b/spec/javascripts/boards/board_list_common_spec.js
@@ -9,7 +9,7 @@ import BoardList from '~/boards/components/board_list.vue';
 
 import '~/boards/models/issue';
 import '~/boards/models/list';
-import { listObj, boardsMockInterceptor, mockBoardService } from './mock_data';
+import { listObj, boardsMockInterceptor } from './mock_data';
 import store from '~/boards/stores';
 import boardsStore from '~/boards/stores/boards_store';
 
@@ -26,7 +26,6 @@ export default function createComponent({
   document.body.appendChild(el);
   const mock = new MockAdapter(axios);
   mock.onAny().reply(boardsMockInterceptor);
-  gl.boardService = mockBoardService();
   boardsStore.create();
 
   const BoardListComp = Vue.extend(BoardList);
diff --git a/spec/javascripts/boards/board_new_issue_spec.js b/spec/javascripts/boards/board_new_issue_spec.js
index 76675a78db2..8e4093cc25c 100644
--- a/spec/javascripts/boards/board_new_issue_spec.js
+++ b/spec/javascripts/boards/board_new_issue_spec.js
@@ -7,7 +7,7 @@ import boardNewIssue from '~/boards/components/board_new_issue.vue';
 import boardsStore from '~/boards/stores/boards_store';
 
 import '~/boards/models/list';
-import { listObj, boardsMockInterceptor, mockBoardService } from './mock_data';
+import { listObj, boardsMockInterceptor } from './mock_data';
 
 describe('Issue boards new issue form', () => {
   let vm;
@@ -36,7 +36,6 @@ describe('Issue boards new issue form', () => {
     mock = new MockAdapter(axios);
     mock.onAny().reply(boardsMockInterceptor);
 
-    gl.boardService = mockBoardService();
     boardsStore.create();
 
     list = new List(listObj);
diff --git a/spec/javascripts/monitoring/charts/column_spec.js b/spec/javascripts/monitoring/charts/column_spec.js
index 27b3d435f08..9676617e8e1 100644
--- a/spec/javascripts/monitoring/charts/column_spec.js
+++ b/spec/javascripts/monitoring/charts/column_spec.js
@@ -11,7 +11,7 @@ describe('Column component', () => {
     columnChart = shallowMount(localVue.extend(ColumnChart), {
       propsData: {
         graphData: {
-          queries: [
+          metrics: [
             {
               x_label: 'Time',
               y_label: 'Usage',
diff --git a/spec/javascripts/monitoring/mock_data.js b/spec/javascripts/monitoring/mock_data.js
index f9cc839bde6..f59c4ee4264 100644
--- a/spec/javascripts/monitoring/mock_data.js
+++ b/spec/javascripts/monitoring/mock_data.js
@@ -105,22 +105,11 @@ export const graphDataPrometheusQuery = {
   metrics: [
     {
       id: 'metric_a1',
-      metric_id: 2,
+      metricId: '2',
       query: 'max(go_memstats_alloc_bytes{job="prometheus"}) by (job) /1024/1024',
       unit: 'MB',
       label: 'Total Consumption',
-      prometheus_endpoint_path:
-        '/root/kubernetes-gke-project/environments/35/prometheus/api/v1/query?query=max%28go_memstats_alloc_bytes%7Bjob%3D%22prometheus%22%7D%29+by+%28job%29+%2F1024%2F1024',
-    },
-  ],
-  queries: [
-    {
-      metricId: null,
-      id: 'metric_a1',
       metric_id: 2,
-      query: 'max(go_memstats_alloc_bytes{job="prometheus"}) by (job) /1024/1024',
-      unit: 'MB',
-      label: 'Total Consumption',
       prometheus_endpoint_path:
         '/root/kubernetes-gke-project/environments/35/prometheus/api/v1/query?query=max%28go_memstats_alloc_bytes%7Bjob%3D%22prometheus%22%7D%29+by+%28job%29+%2F1024%2F1024',
       result: [
@@ -140,24 +129,12 @@ export const graphDataPrometheusQueryRange = {
   metrics: [
     {
       id: 'metric_a1',
-      metric_id: 2,
+      metricId: '2',
       query_range:
         'avg(sum(container_memory_usage_bytes{container_name!="POD",pod_name=~"^%{ci_environment_slug}-(.*)",namespace="%{kube_namespace}"}) by (job)) without (job)  /1024/1024/1024',
       unit: 'MB',
       label: 'Total Consumption',
-      prometheus_endpoint_path:
-        '/root/kubernetes-gke-project/environments/35/prometheus/api/v1/query?query=max%28go_memstats_alloc_bytes%7Bjob%3D%22prometheus%22%7D%29+by+%28job%29+%2F1024%2F1024',
-    },
-  ],
-  queries: [
-    {
-      metricId: '10',
-      id: 'metric_a1',
       metric_id: 2,
-      query_range:
-        'avg(sum(container_memory_usage_bytes{container_name!="POD",pod_name=~"^%{ci_environment_slug}-(.*)",namespace="%{kube_namespace}"}) by (job)) without (job)  /1024/1024/1024',
-      unit: 'MB',
-      label: 'Total Consumption',
       prometheus_endpoint_path:
         '/root/kubernetes-gke-project/environments/35/prometheus/api/v1/query?query=max%28go_memstats_alloc_bytes%7Bjob%3D%22prometheus%22%7D%29+by+%28job%29+%2F1024%2F1024',
       result: [
@@ -176,8 +153,7 @@ export const graphDataPrometheusQueryRangeMultiTrack = {
   weight: 3,
   x_label: 'Status Code',
   y_label: 'Time',
-  metrics: [],
-  queries: [
+  metrics: [
     {
       metricId: '1',
       id: 'response_metrics_nginx_ingress_throughput_status_code',
diff --git a/spec/javascripts/monitoring/utils_spec.js b/spec/javascripts/monitoring/utils_spec.js
index 202b4ec8f2e..3459b44c7ec 100644
--- a/spec/javascripts/monitoring/utils_spec.js
+++ b/spec/javascripts/monitoring/utils_spec.js
@@ -314,32 +314,32 @@ describe('isDateTimePickerInputValid', () => {
 });
 
 describe('graphDataValidatorForAnomalyValues', () => {
-  let oneQuery;
-  let threeQueries;
-  let fourQueries;
+  let oneMetric;
+  let threeMetrics;
+  let fourMetrics;
   beforeEach(() => {
-    oneQuery = graphDataPrometheusQuery;
-    threeQueries = anomalyMockGraphData;
+    oneMetric = graphDataPrometheusQuery;
+    threeMetrics = anomalyMockGraphData;
 
-    const queries = [...threeQueries.queries];
-    queries.push(threeQueries.queries[0]);
-    fourQueries = {
+    const metrics = [...threeMetrics.metrics];
+    metrics.push(threeMetrics.metrics[0]);
+    fourMetrics = {
       ...anomalyMockGraphData,
-      queries,
+      metrics,
     };
   });
   /*
-   * Anomaly charts can accept results for exactly 3 queries,
+   * Anomaly charts can accept results for exactly 3 metrics,
    */
   it('validates passes with the right query format', () => {
-    expect(graphDataValidatorForAnomalyValues(threeQueries)).toBe(true);
+    expect(graphDataValidatorForAnomalyValues(threeMetrics)).toBe(true);
   });
 
   it('validation fails for wrong format, 1 metric', () => {
-    expect(graphDataValidatorForAnomalyValues(oneQuery)).toBe(false);
+    expect(graphDataValidatorForAnomalyValues(oneMetric)).toBe(false);
   });
 
   it('validation fails for wrong format, more than 3 metrics', () => {
-    expect(graphDataValidatorForAnomalyValues(fourQueries)).toBe(false);
+    expect(graphDataValidatorForAnomalyValues(fourMetrics)).toBe(false);
   });
 });
diff --git a/spec/javascripts/vue_shared/components/clipboard_button_spec.js b/spec/javascripts/vue_shared/components/clipboard_button_spec.js
deleted file mode 100644
index 29a76574b89..00000000000
--- a/spec/javascripts/vue_shared/components/clipboard_button_spec.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import Vue from 'vue';
-import clipboardButton from '~/vue_shared/components/clipboard_button.vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
-
-describe('clipboard button', () => {
-  const Component = Vue.extend(clipboardButton);
-  let vm;
-
-  afterEach(() => {
-    vm.$destroy();
-  });
-
-  describe('without gfm', () => {
-    beforeEach(() => {
-      vm = mountComponent(Component, {
-        text: 'copy me',
-        title: 'Copy this value',
-        cssClass: 'btn-danger',
-      });
-    });
-
-    it('renders a button for clipboard', () => {
-      expect(vm.$el.tagName).toEqual('BUTTON');
-      expect(vm.$el.getAttribute('data-clipboard-text')).toEqual('copy me');
-      expect(vm.$el).toHaveSpriteIcon('duplicate');
-    });
-
-    it('should have a tooltip with default values', () => {
-      expect(vm.$el.getAttribute('data-original-title')).toEqual('Copy this value');
-    });
-
-    it('should render provided classname', () => {
-      expect(vm.$el.classList).toContain('btn-danger');
-    });
-  });
-
-  describe('with gfm', () => {
-    it('sets data-clipboard-text with gfm', () => {
-      vm = mountComponent(Component, {
-        text: 'copy me',
-        gfm: '`path/to/file`',
-        title: 'Copy this value',
-        cssClass: 'btn-danger',
-      });
-
-      expect(vm.$el.getAttribute('data-clipboard-text')).toEqual(
-        '{"text":"copy me","gfm":"`path/to/file`"}',
-      );
-    });
-  });
-});
diff --git a/spec/javascripts/vue_shared/components/user_avatar/user_avatar_link_spec.js b/spec/javascripts/vue_shared/components/user_avatar/user_avatar_link_spec.js
deleted file mode 100644
index 80aa75847ae..00000000000
--- a/spec/javascripts/vue_shared/components/user_avatar/user_avatar_link_spec.js
+++ /dev/null
@@ -1,109 +0,0 @@
-import _ from 'underscore';
-import Vue from 'vue';
-import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
-import { TEST_HOST } from 'spec/test_constants';
-
-describe('User Avatar Link Component', function() {
-  beforeEach(function() {
-    this.propsData = {
-      linkHref: `${TEST_HOST}/myavatarurl.com`,
-      imgSize: 99,
-      imgSrc: `${TEST_HOST}/myavatarurl.com`,
-      imgAlt: 'mydisplayname',
-      imgCssClasses: 'myextraavatarclass',
-      tooltipText: 'tooltip text',
-      tooltipPlacement: 'bottom',
-      username: 'username',
-    };
-
-    const UserAvatarLinkComponent = Vue.extend(UserAvatarLink);
-
-    this.userAvatarLink = new UserAvatarLinkComponent({
-      propsData: this.propsData,
-    }).$mount();
-
-    [this.userAvatarImage] = this.userAvatarLink.$children;
-  });
-
-  it('should return a defined Vue component', function() {
-    expect(this.userAvatarLink).toBeDefined();
-  });
-
-  it('should have user-avatar-image registered as child component', function() {
-    expect(this.userAvatarLink.$options.components.userAvatarImage).toBeDefined();
-  });
-
-  it('user-avatar-link should have user-avatar-image as child component', function() {
-    expect(this.userAvatarImage).toBeDefined();
-  });
-
-  it('should render <a> as a child element', function() {
-    const link = this.userAvatarLink.$el;
-
-    expect(link.tagName).toBe('A');
-    expect(link.href).toBe(this.propsData.linkHref);
-  });
-
-  it('renders imgSrc with imgSize as image', function() {
-    const { imgSrc, imgSize } = this.propsData;
-    const image = this.userAvatarLink.$el.querySelector('img');
-
-    expect(image).not.toBeNull();
-    expect(image.src).toBe(`${imgSrc}?width=${imgSize}`);
-  });
-
-  it('should return necessary props as defined', function() {
-    _.each(this.propsData, (val, key) => {
-      expect(this.userAvatarLink[key]).toBeDefined();
-    });
-  });
-
-  describe('no username', function() {
-    beforeEach(function(done) {
-      this.userAvatarLink.username = '';
-
-      Vue.nextTick(done);
-    });
-
-    it('should only render image tag in link', function() {
-      const childElements = this.userAvatarLink.$el.childNodes;
-
-      expect(this.userAvatarLink.$el.querySelector('img')).not.toBe('null');
-
-      // Vue will render the hidden component as <!---->
-      expect(childElements[1].tagName).toBeUndefined();
-    });
-
-    it('should render avatar image tooltip', function() {
-      expect(this.userAvatarLink.shouldShowUsername).toBe(false);
-      expect(this.userAvatarLink.avatarTooltipText).toEqual(this.propsData.tooltipText);
-    });
-  });
-
-  describe('username', function() {
-    it('should not render avatar image tooltip', function() {
-      expect(this.userAvatarLink.$el.querySelector('.js-user-avatar-image-toolip')).toBeNull();
-    });
-
-    it('should render username prop in <span>', function() {
-      expect(
-        this.userAvatarLink.$el.querySelector('.js-user-avatar-link-username').innerText.trim(),
-      ).toEqual(this.propsData.username);
-    });
-
-    it('should render text tooltip for <span>', function() {
-      expect(
-        this.userAvatarLink.$el.querySelector('.js-user-avatar-link-username').dataset
-          .originalTitle,
-      ).toEqual(this.propsData.tooltipText);
-    });
-
-    it('should render text tooltip placement for <span>', function() {
-      expect(
-        this.userAvatarLink.$el
-          .querySelector('.js-user-avatar-link-username')
-          .getAttribute('tooltip-placement'),
-      ).toEqual(this.propsData.tooltipPlacement);
-    });
-  });
-});