diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-29 15:08:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-29 15:08:03 +0300 |
| commit | ef59e05bd14aea8bf19bbe77c52116bfe24c7107 (patch) | |
| tree | 6b3f51c7afd746c2cbe3369fcff9a97b392d6cac /spec/frontend/alerts_settings/components | |
| parent | e878a8e80f55bb09565ca33408f5295b8784e455 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/alerts_settings/components')
| -rw-r--r-- | spec/frontend/alerts_settings/components/alerts_settings_wrapper_spec.js | 3 | ||||
| -rw-r--r-- | spec/frontend/alerts_settings/components/mocks/apollo_mock.js | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/spec/frontend/alerts_settings/components/alerts_settings_wrapper_spec.js b/spec/frontend/alerts_settings/components/alerts_settings_wrapper_spec.js index 6193233881d..ed185c11732 100644 --- a/spec/frontend/alerts_settings/components/alerts_settings_wrapper_spec.js +++ b/spec/frontend/alerts_settings/components/alerts_settings_wrapper_spec.js @@ -476,9 +476,6 @@ describe('AlertsSettingsWrapper', () => { destroyHttpIntegration(wrapper); expect(destroyIntegrationHandler).toHaveBeenCalled(); - await waitForPromises(); - - expect(findIntegrations()).toHaveLength(3); }); it('displays flash if mutation had a recoverable error', async () => { diff --git a/spec/frontend/alerts_settings/components/mocks/apollo_mock.js b/spec/frontend/alerts_settings/components/mocks/apollo_mock.js index 694dff56632..170af1b5e0c 100644 --- a/spec/frontend/alerts_settings/components/mocks/apollo_mock.js +++ b/spec/frontend/alerts_settings/components/mocks/apollo_mock.js @@ -102,7 +102,7 @@ export const destroyIntegrationResponse = { httpIntegrationDestroy: { errors: [], integration: { - __typename: 'AlertManagementIntegration', + __typename: 'AlertManagementHttpIntegration', id: '37', type: 'HTTP', active: true, |