diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
commit | 7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0 (patch) | |
tree | 5bdc2229f5198d516781f8d24eace62fc7e589e9 /spec/frontend/environments | |
parent | 185b095e93520f96e9cfc31d9c3e69b498cdab7c (diff) |
Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42
Diffstat (limited to 'spec/frontend/environments')
-rw-r--r-- | spec/frontend/environments/environment_actions_spec.js | 6 | ||||
-rw-r--r-- | spec/frontend/environments/environment_rollback_spec.js | 2 | ||||
-rw-r--r-- | spec/frontend/environments/graphql/mock_data.js | 1 |
3 files changed, 3 insertions, 6 deletions
diff --git a/spec/frontend/environments/environment_actions_spec.js b/spec/frontend/environments/environment_actions_spec.js index 68895b194a1..48483152f7a 100644 --- a/spec/frontend/environments/environment_actions_spec.js +++ b/spec/frontend/environments/environment_actions_spec.js @@ -10,11 +10,7 @@ import actionMutation from '~/environments/graphql/mutations/action.mutation.gra import { confirmAction } from '~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal'; import createMockApollo from 'helpers/mock_apollo_helper'; -jest.mock('~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal', () => { - return { - confirmAction: jest.fn(), - }; -}); +jest.mock('~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal'); const scheduledJobAction = { name: 'scheduled action', diff --git a/spec/frontend/environments/environment_rollback_spec.js b/spec/frontend/environments/environment_rollback_spec.js index be61c6fcc90..5d36209f8a6 100644 --- a/spec/frontend/environments/environment_rollback_spec.js +++ b/spec/frontend/environments/environment_rollback_spec.js @@ -76,7 +76,7 @@ describe('Rollback Component', () => { expect(apolloProvider.defaultClient.mutate).toHaveBeenCalledWith({ mutation: setEnvironmentToRollback, - variables: { environment }, + variables: { environment: { ...environment, isLastDeployment: true, retryUrl } }, }); }); }); diff --git a/spec/frontend/environments/graphql/mock_data.js b/spec/frontend/environments/graphql/mock_data.js index d246641b94b..355b77b55c3 100644 --- a/spec/frontend/environments/graphql/mock_data.js +++ b/spec/frontend/environments/graphql/mock_data.js @@ -537,6 +537,7 @@ export const folder = { export const resolvedEnvironment = { id: 41, + retryUrl: '/h5bp/html5-boilerplate/-/jobs/1014/retry', globalId: 'gid://gitlab/Environment/41', name: 'review/hello', state: 'available', |