diff options
Diffstat (limited to 'spec/frontend/incidents_settings')
6 files changed, 54 insertions, 44 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 dd3589e2951..f3f610e4bb7 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,19 +81,23 @@ exports[`Alert integration settings form default state should match the default </gl-form-checkbox-stub> </gl-form-group-stub> - <gl-button-stub - category="tertiary" - class="js-no-auto-disable" - data-qa-selector="save_changes_button" - icon="" - size="medium" - type="submit" - variant="success" + <div + class="gl-display-flex gl-justify-content-end" > + <gl-button-stub + category="primary" + class="js-no-auto-disable" + data-qa-selector="save_changes_button" + icon="" + size="medium" + type="submit" + variant="success" + > + + Save changes - Save changes - - </gl-button-stub> + </gl-button-stub> + </div> </form> </div> `; 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 5f355ee8261..3ad4c13382d 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 @@ -9,16 +9,16 @@ exports[`IncidentsSettingTabs should render the component 1`] = ` <div class="settings-header" > - <h3 - class="h4" + <h4 + class="gl-my-3! gl-py-1" > Incidents - </h3> + </h4> <gl-button-stub - category="tertiary" + category="primary" class="js-settings-toggle" icon="" size="medium" 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 17ada722034..78bb238fcb6 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 @@ -35,27 +35,31 @@ exports[`Alert integration settings form should match the default snapshot 1`] = /> <div - class="gl-text-gray-400 gl-pt-2" + 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 - category="tertiary" - class="gl-mt-3" - data-testid="webhook-reset-btn" - icon="" - role="button" - size="medium" - tabindex="0" - variant="default" + <div + class="gl-display-flex gl-justify-content-end" > + <gl-button-stub + category="primary" + class="gl-mt-3" + data-testid="webhook-reset-btn" + icon="" + role="button" + size="medium" + tabindex="0" + variant="default" + > + + Reset webhook URL - Reset webhook URL - - </gl-button-stub> + </gl-button-stub> + </div> <gl-modal-stub modalclass="" @@ -72,18 +76,22 @@ exports[`Alert integration settings form should match the default snapshot 1`] = </gl-modal-stub> </gl-form-group-stub> - <gl-button-stub - category="tertiary" - class="js-no-auto-disable" - icon="" - size="medium" - type="submit" - variant="success" + <div + class="gl-display-flex gl-justify-content-end" > + <gl-button-stub + category="primary" + class="js-no-auto-disable" + icon="" + size="medium" + type="submit" + variant="success" + > + + Save changes - Save changes - - </gl-button-stub> + </gl-button-stub> + </div> </form> </div> `; diff --git a/spec/frontend/incidents_settings/components/incidents_settings_service_spec.js b/spec/frontend/incidents_settings/components/incidents_settings_service_spec.js index 58f9a318808..5010fc0bb5c 100644 --- a/spec/frontend/incidents_settings/components/incidents_settings_service_spec.js +++ b/spec/frontend/incidents_settings/components/incidents_settings_service_spec.js @@ -1,9 +1,9 @@ -import axios from '~/lib/utils/axios_utils'; import AxiosMockAdapter from 'axios-mock-adapter'; +import axios from '~/lib/utils/axios_utils'; import httpStatusCodes from '~/lib/utils/http_status'; import IncidentsSettingsService from '~/incidents_settings/incidents_settings_service'; import { ERROR_MSG } from '~/incidents_settings/constants'; -import createFlash from '~/flash'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import { refreshCurrentPage } from '~/lib/utils/url_utility'; jest.mock('~/flash'); diff --git a/spec/frontend/incidents_settings/components/incidents_settings_tabs_spec.js b/spec/frontend/incidents_settings/components/incidents_settings_tabs_spec.js index 47e2aecc108..c56b9ed2a69 100644 --- a/spec/frontend/incidents_settings/components/incidents_settings_tabs_spec.js +++ b/spec/frontend/incidents_settings/components/incidents_settings_tabs_spec.js @@ -6,9 +6,7 @@ describe('IncidentsSettingTabs', () => { let wrapper; beforeEach(() => { - wrapper = shallowMount(IncidentsSettingTabs, { - provide: { glFeatures: { pagerdutyWebhook: true } }, - }); + wrapper = shallowMount(IncidentsSettingTabs); }); afterEach(() => { diff --git a/spec/frontend/incidents_settings/components/pagerduty_form_spec.js b/spec/frontend/incidents_settings/components/pagerduty_form_spec.js index 521094ad54c..50d0de8a753 100644 --- a/spec/frontend/incidents_settings/components/pagerduty_form_spec.js +++ b/spec/frontend/incidents_settings/components/pagerduty_form_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; import waitForPromises from 'helpers/wait_for_promises'; -import PagerDutySettingsForm from '~/incidents_settings/components/pagerduty_form.vue'; import { GlAlert, GlModal } from '@gitlab/ui'; +import PagerDutySettingsForm from '~/incidents_settings/components/pagerduty_form.vue'; describe('Alert integration settings form', () => { let wrapper; |