diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-07 06:06:12 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-07 06:06:12 +0000 |
commit | 2a87ae2e368ec6fbb1e75b89bc092ba2fd7eb913 (patch) | |
tree | 4d6b995e3292562627ddeeacbc5b5eba0ce64032 /spec/frontend/grafana_integration | |
parent | eb0d9e20c5a81b0a556308ae3fc8015fcc3c9621 (diff) | |
download | gitlab-ce-2a87ae2e368ec6fbb1e75b89bc092ba2fd7eb913.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/grafana_integration')
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); + }); + }); }); |