Merge branch 'emilyring-terraform-mr-fix' into 'master'

Remove Visibility from terraform widget

See merge request gitlab-org/gitlab!30737

app/assets/javascripts/vue_merge_request_widget/components/mr_widget_terraform_plan.vue

@@ -5,7 +5,6 @@ import axios from '~/lib/utils/axios_utils';
 import CiIcon from '../../vue_shared/components/ci_icon.vue';
 import flash from '~/flash';
 import Poll from '~/lib/utils/poll';
-import Visibility from 'visibilityjs';
 
 export default {
   name: 'MRWidgetTerraformPlan',
@@ -68,7 +67,11 @@ export default {
         method: 'fetchPlans',
         successCallback: ({ data }) => {
           this.plans = data;
-          this.loading = false;
+
+          if (Object.keys(this.plan).length) {
+            this.loading = false;
+            poll.stop();
+          }
         },
         errorCallback: () => {
           this.plans = {};
@@ -77,17 +80,7 @@ export default {
         },
       });
 
-      if (!Visibility.hidden()) {
-        poll.makeRequest();
-      }
-
-      Visibility.change(() => {
-        if (!Visibility.hidden()) {
-          poll.restart();
-        } else {
-          poll.stop();
-        }
-      });
+      poll.makeRequest();
     },
   },
 };

changelogs/unreleased/emilyring-terraform-mr-fix.yml

+---
+title: Remove Visibility from terraform widget
+merge_request: 30737
+author:
+type: fixed

spec/frontend/vue_mr_widget/components/mr_widget_terraform_plan_spec.js

@@ -3,6 +3,7 @@ import { shallowMount } from '@vue/test-utils';
 import axios from '~/lib/utils/axios_utils';
 import MockAdapter from 'axios-mock-adapter';
 import MrWidgetTerraformPlan from '~/vue_merge_request_widget/components/mr_widget_terraform_plan.vue';
+import Poll from '~/lib/utils/poll';
 
 const plan = {
   create: 10,
@@ -57,11 +58,23 @@ describe('MrWidgetTerraformPlan', () => {
   });
 
   describe('successful poll', () => {
+    let pollRequest;
+    let pollStop;
+
     beforeEach(() => {
+      pollRequest = jest.spyOn(Poll.prototype, 'makeRequest');
+      pollStop = jest.spyOn(Poll.prototype, 'stop');
+
       mockPollingApi(200, { 'tfplan.json': plan }, {});
+
       return mountWrapper();
     });
 
+    afterEach(() => {
+      pollRequest.mockRestore();
+      pollStop.mockRestore();
+    });
+
     it('content change text', () => {
       expect(wrapper.find(GlSprintf).exists()).toBe(true);
     });
@@ -69,6 +82,11 @@ describe('MrWidgetTerraformPlan', () => {
     it('renders button when url is found', () => {
       expect(wrapper.find('a').text()).toContain('View full log');
     });
+
+    it('does not make additional requests after poll is successful', () => {
+      expect(pollRequest).toHaveBeenCalledTimes(1);
+      expect(pollStop).toHaveBeenCalledTimes(1);
+    });
   });
 
   describe('polling fails', () => {