Merge branch 'master' into issue_60515issue_60515

1 files changed, 17 insertions, 46 deletions

diff --git a/spec/javascripts/monitoring/dashboard_spec.js b/spec/javascripts/monitoring/dashboard_spec.js
index f9c3122088e..f4166987aed 100644
--- a/spec/javascripts/monitoring/dashboard_spec.js
+++ b/spec/javascripts/monitoring/dashboard_spec.js
@@ -20,7 +20,7 @@ const propsData = {
   tagsPath: '/path/to/tags',
   projectPath: '/path/to/project',
   metricsEndpoint: mockApiEndpoint,
-  deploymentEndpoint: null,
+  deploymentsEndpoint: null,
   emptyGettingStartedSvgPath: '/path/to/getting-started.svg',
   emptyLoadingSvgPath: '/path/to/loading.svg',
   emptyNoDataSvgPath: '/path/to/no-data.svg',
@@ -49,9 +49,6 @@ describe('Dashboard', () => {
     window.gon = {
       ...window.gon,
       ee: false,
-      features: {
-        grafanaDashboardLink: true,
-      },
     };
 
     store = createStore();
@@ -382,52 +379,26 @@ describe('Dashboard', () => {
   describe('external dashboard link', () => {
     beforeEach(() => {
       mock.onGet(mockApiEndpoint).reply(200, metricsGroupsAPIResponse);
-    });
-
-    describe('with feature flag enabled', () => {
-      beforeEach(() => {
-        component = new DashboardComponent({
-          el: document.querySelector('.prometheus-graphs'),
-          propsData: {
-            ...propsData,
-            hasMetrics: true,
-            showPanels: false,
-            externalDashboardUrl: '/mockUrl',
-          },
-          store,
-        });
-      });
 
-      it('shows the link', done => {
-        setTimeout(() => {
-          expect(component.$el.querySelector('.js-external-dashboard-link').innerText).toContain(
-            'View full dashboard',
-          );
-          done();
-        });
+      component = new DashboardComponent({
+        el: document.querySelector('.prometheus-graphs'),
+        propsData: {
+          ...propsData,
+          hasMetrics: true,
+          showPanels: false,
+          showTimeWindowDropdown: false,
+          externalDashboardUrl: '/mockUrl',
+        },
+        store,
       });
     });
 
-    describe('without feature flage enabled', () => {
-      beforeEach(() => {
-        window.gon.features.grafanaDashboardLink = false;
-        component = new DashboardComponent({
-          el: document.querySelector('.prometheus-graphs'),
-          propsData: {
-            ...propsData,
-            hasMetrics: true,
-            showPanels: false,
-            externalDashboardUrl: '',
-          },
-          store,
-        });
-      });
-
-      it('does not show the link', done => {
-        setTimeout(() => {
-          expect(component.$el.querySelector('.js-external-dashboard-link')).toBe(null);
-          done();
-        });
+    it('shows the link', done => {
+      setTimeout(() => {
+        expect(component.$el.querySelector('.js-external-dashboard-link').innerText).toContain(
+          'View full dashboard',
+        );
+        done();
       });
     });
   });