diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-21 18:10:03 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-21 18:10:03 +0300 |
commit | d5098d9fe3a5f05d9b90996851ab753f8b40cf65 (patch) | |
tree | 6f909667e89a3ad70e10c39b48fc417459b759fd /spec/frontend/incidents_settings | |
parent | 4ea7a80898d3266d386ca928d7c253d4bf588e1c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/incidents_settings')
-rw-r--r-- | spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap | 12 | ||||
-rw-r--r-- | spec/frontend/incidents_settings/components/alerts_form_spec.js | 3 |
2 files changed, 15 insertions, 0 deletions
diff --git a/spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap b/spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap index f3f610e4bb7..fd6af59eb48 100644 --- a/spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap +++ b/spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap @@ -81,6 +81,18 @@ exports[`Alert integration settings form default state should match the default </gl-form-checkbox-stub> </gl-form-group-stub> + <gl-form-group-stub + class="gl-pl-0 gl-mb-5" + > + <gl-form-checkbox-stub + checked="true" + > + <span> + Automatically close incident issues when the associated Prometheus alert resolves. + </span> + </gl-form-checkbox-stub> + </gl-form-group-stub> + <div class="gl-display-flex gl-justify-content-end" > diff --git a/spec/frontend/incidents_settings/components/alerts_form_spec.js b/spec/frontend/incidents_settings/components/alerts_form_spec.js index 04832f31e58..32d13b8edc0 100644 --- a/spec/frontend/incidents_settings/components/alerts_form_spec.js +++ b/spec/frontend/incidents_settings/components/alerts_form_spec.js @@ -10,12 +10,14 @@ describe('Alert integration settings form', () => { beforeEach(() => { wrapper = shallowMount(AlertsSettingsForm, { provide: { + glFeatures: { autoCloseIncident: true }, service, alertSettings: { issueTemplateKey: 'selecte_tmpl', createIssue: true, sendEmail: false, templates: [], + autoCloseIncident: true, }, }, }); @@ -42,6 +44,7 @@ describe('Alert integration settings form', () => { create_issue: wrapper.vm.createIssueEnabled, issue_template_key: wrapper.vm.issueTemplate, send_email: wrapper.vm.sendEmailEnabled, + auto_close_incident: wrapper.vm.autoCloseIncident, }), ); }); |