Add latest changes from gitlab-org/gitlab@master

3 files changed, 17 insertions, 0 deletions

diff --git a/spec/frontend/grafana_integration/components/__snapshots__/grafana_integration_spec.js.snap b/spec/frontend/grafana_integration/components/__snapshots__/grafana_integration_spec.js.snap
index 43239da344f..99f669dba5a 100644
--- a/spec/frontend/grafana_integration/components/__snapshots__/grafana_integration_spec.js.snap
+++ b/spec/frontend/grafana_integration/components/__snapshots__/grafana_integration_spec.js.snap
@@ -35,6 +35,15 @@ exports[`grafana integration component default state to match the default snapsh
     class="settings-content"
   >
     <form>
+      <glformcheckbox-stub
+        class="mb-4"
+        id="grafana-integration-enabled"
+      >
+        
+        Active
+      
+      </glformcheckbox-stub>
+       
       <glformgroup-stub
         description="Enter the base URL of the Grafana instance."
         label="Grafana URL"
diff --git a/spec/frontend/grafana_integration/components/grafana_integration_spec.js b/spec/frontend/grafana_integration/components/grafana_integration_spec.js
index 594ea94dc6a..c098ada0519 100644
--- a/spec/frontend/grafana_integration/components/grafana_integration_spec.js
+++ b/spec/frontend/grafana_integration/components/grafana_integration_spec.js
@@ -86,6 +86,7 @@ describe('grafana integration component', () => {
             grafana_integration_attributes: {
               grafana_url: grafanaIntegrationUrl,
               token: grafanaIntegrationToken,
+              enabled: false,
             },
           },
         },
diff --git a/spec/frontend/grafana_integration/store/mutations_spec.js b/spec/frontend/grafana_integration/store/mutations_spec.js
index d9b8c258623..18e87394189 100644
--- a/spec/frontend/grafana_integration/store/mutations_spec.js
+++ b/spec/frontend/grafana_integration/store/mutations_spec.js
@@ -25,4 +25,11 @@ describe('grafana integration mutations', () => {
       expect(localState.grafanaToken).toBe(mockToken);
     });
   });
+  describe('SET_GRAFANA_ENABLED', () => {
+    it('updates grafanaEnabled for integration', () => {
+      mutations.SET_GRAFANA_ENABLED(localState, true);
+
+      expect(localState.grafanaEnabled).toBe(true);
+    });
+  });
 });