Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 75 deletions

diff --git a/spec/frontend/behaviors/markdown/render_gfm_spec.js b/spec/frontend/behaviors/markdown/render_gfm_spec.js
index 220ad874b47..0bbb92282e5 100644
--- a/spec/frontend/behaviors/markdown/render_gfm_spec.js
+++ b/spec/frontend/behaviors/markdown/render_gfm_spec.js
@@ -1,7 +1,4 @@
 import { renderGFM } from '~/behaviors/markdown/render_gfm';
-import renderMetrics from '~/behaviors/markdown/render_metrics';
-
-jest.mock('~/behaviors/markdown/render_metrics');
 
 describe('renderGFM', () => {
   it('handles a missing element', () => {
@@ -9,27 +6,4 @@ describe('renderGFM', () => {
       renderGFM();
     }).not.toThrow();
   });
-
-  describe('remove_monitor_metrics flag', () => {
-    let metricsElement;
-
-    beforeEach(() => {
-      window.gon = { features: { removeMonitorMetrics: true } };
-      metricsElement = document.createElement('div');
-      metricsElement.setAttribute('class', '.js-render-metrics');
-    });
-
-    it('renders metrics when the flag is disabled', () => {
-      window.gon.features = { features: { removeMonitorMetrics: false } };
-      renderGFM(metricsElement);
-
-      expect(renderMetrics).toHaveBeenCalled();
-    });
-
-    it('does not render metrics when the flag is enabled', () => {
-      renderGFM(metricsElement);
-
-      expect(renderMetrics).not.toHaveBeenCalled();
-    });
-  });
 });
diff --git a/spec/frontend/behaviors/markdown/render_metrics_spec.js b/spec/frontend/behaviors/markdown/render_metrics_spec.js
deleted file mode 100644
index ab81ed6b8f0..00000000000
--- a/spec/frontend/behaviors/markdown/render_metrics_spec.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import { TEST_HOST } from 'helpers/test_constants';
-import renderMetrics from '~/behaviors/markdown/render_metrics';
-
-const mockEmbedGroup = jest.fn();
-
-jest.mock('vue', () => ({ extend: () => mockEmbedGroup }));
-jest.mock('~/monitoring/components/embeds/embed_group.vue', () => jest.fn());
-jest.mock('~/monitoring/stores/embed_group/', () => ({ createStore: jest.fn() }));
-
-const getElements = () => Array.from(document.getElementsByClassName('js-render-metrics'));
-
-describe('Render metrics for Gitlab Flavoured Markdown', () => {
-  it('does nothing when no elements are found', () => {
-    return renderMetrics([]).then(() => {
-      expect(mockEmbedGroup).not.toHaveBeenCalled();
-    });
-  });
-
-  it('renders a vue component when elements are found', () => {
-    document.body.innerHTML = `<div class="js-render-metrics" data-dashboard-url="${TEST_HOST}"></div>`;
-
-    return renderMetrics(getElements()).then(() => {
-      expect(mockEmbedGroup).toHaveBeenCalledTimes(1);
-      expect(mockEmbedGroup).toHaveBeenCalledWith(
-        expect.objectContaining({ propsData: { urls: [`${TEST_HOST}`] } }),
-      );
-    });
-  });
-
-  it('takes sibling metrics and groups them under a shared parent', () => {
-    document.body.innerHTML = `
-      <p><span>Hello</span></p>
-      <div class="js-render-metrics" data-dashboard-url="${TEST_HOST}/1"></div>
-      <div class="js-render-metrics" data-dashboard-url="${TEST_HOST}/2"></div>
-      <p><span>Hello</span></p>
-      <div class="js-render-metrics" data-dashboard-url="${TEST_HOST}/3"></div>
-    `;
-
-    return renderMetrics(getElements()).then(() => {
-      expect(mockEmbedGroup).toHaveBeenCalledTimes(2);
-      expect(mockEmbedGroup).toHaveBeenCalledWith(
-        expect.objectContaining({ propsData: { urls: [`${TEST_HOST}/1`, `${TEST_HOST}/2`] } }),
-      );
-      expect(mockEmbedGroup).toHaveBeenCalledWith(
-        expect.objectContaining({ propsData: { urls: [`${TEST_HOST}/3`] } }),
-      );
-    });
-  });
-});