diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /spec/frontend/incidents_settings/components | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) | |
download | gitlab-ce-8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca.tar.gz |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'spec/frontend/incidents_settings/components')
3 files changed, 11 insertions, 14 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 e4620590e62..c3fd4a9bab2 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 @@ -17,7 +17,7 @@ exports[`Alert integration settings form default state should match the default data-qa-selector="create_issue_checkbox" > <span> - Create an issue. Issues are created for each alert triggered. + Create an incident. Incidents are created for each alert triggered. </span> </gl-form-checkbox-stub> </gl-form-group-stub> @@ -32,7 +32,7 @@ exports[`Alert integration settings form default state should match the default for="alert-integration-settings-issue-template" > - Issue template (optional) + Incident template (optional) <gl-link-stub href="/help/user/project/description_templates#creating-issue-templates" @@ -47,7 +47,7 @@ exports[`Alert integration settings form default state should match the default <gl-dropdown-stub block="true" - category="tertiary" + category="primary" data-qa-selector="incident_templates_dropdown" headertext="" id="alert-integration-settings-issue-template" @@ -60,6 +60,7 @@ exports[`Alert integration settings form default state should match the default data-qa-selector="incident_templates_item" iconcolor="" iconname="" + iconrightarialabel="" iconrightname="" ischeckitem="true" secondarytext="" @@ -88,7 +89,7 @@ exports[`Alert integration settings form default state should match the default checked="true" > <span> - Automatically close incident issues when the associated Prometheus alert resolves. + Automatically close incidents when the associated Prometheus alert resolves. </span> </gl-form-checkbox-stub> </gl-form-group-stub> diff --git a/spec/frontend/incidents_settings/components/__snapshots__/incidents_settings_tabs_spec.js.snap b/spec/frontend/incidents_settings/components/__snapshots__/incidents_settings_tabs_spec.js.snap index 072e611b9a4..2b3c803be08 100644 --- a/spec/frontend/incidents_settings/components/__snapshots__/incidents_settings_tabs_spec.js.snap +++ b/spec/frontend/incidents_settings/components/__snapshots__/incidents_settings_tabs_spec.js.snap @@ -43,6 +43,7 @@ exports[`IncidentsSettingTabs should render the component 1`] = ` > <gl-tab-stub title="Alert integration" + titlelinkclass="" > <alertssettingsform-stub class="gl-pt-3" @@ -51,6 +52,7 @@ exports[`IncidentsSettingTabs should render the component 1`] = ` </gl-tab-stub> <gl-tab-stub title="PagerDuty integration" + titlelinkclass="" > <pagerdutysettingsform-stub class="gl-pt-3" diff --git a/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap b/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap index 273356151fc..f0eb54c1b3a 100644 --- a/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap +++ b/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap @@ -5,7 +5,9 @@ exports[`Alert integration settings form should match the default snapshot 1`] = <!----> <p> - Setting up a webhook with PagerDuty will automatically create a GitLab issue for each PagerDuty incident. + <gl-sprintf-stub + message="Create a GitLab incident for each PagerDuty incident by %{linkStart}configuring a webhook in PagerDuty%{linkEnd}" + /> </p> <form> @@ -33,18 +35,10 @@ exports[`Alert integration settings form should match the default snapshot 1`] = value="pagerduty.webhook.com" /> - <div - class="gl-text-gray-200 gl-pt-2" - > - <gl-sprintf-stub - message="Create a GitLab issue for each PagerDuty incident by %{docsLink}" - /> - </div> - <gl-button-stub buttontextclasses="" category="primary" - class="gl-mt-3" + class="gl-mt-5" data-testid="webhook-reset-btn" icon="" role="button" |