diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-15 12:11:10 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-15 12:11:10 +0300 |
| commit | 6fe7ad3526d2b84160129f4989e8f9ebfe8ef6b7 (patch) | |
| tree | 8d31948e4b4e4ed798f88c8be735c86b7b9bef9b /spec/frontend | |
| parent | 5e9a1717166c6b9bf0a6cbd00137d5c0043ba442 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend')
| -rw-r--r-- | spec/frontend/sidebar/components/labels/labels_select_widget/mock_data.js | 1 | ||||
| -rw-r--r-- | spec/frontend/vue_shared/issuable/create/components/issuable_label_selector_spec.js | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/spec/frontend/sidebar/components/labels/labels_select_widget/mock_data.js b/spec/frontend/sidebar/components/labels/labels_select_widget/mock_data.js index 2e586961be1..5039f00fe4b 100644 --- a/spec/frontend/sidebar/components/labels/labels_select_widget/mock_data.js +++ b/spec/frontend/sidebar/components/labels/labels_select_widget/mock_data.js @@ -21,6 +21,7 @@ export const mockLockedLabel = { color: '#DADA55', textColor: '#FFFFFF', lockOnMerge: true, + lock_on_merge: true, }; export const mockLabels = [ diff --git a/spec/frontend/vue_shared/issuable/create/components/issuable_label_selector_spec.js b/spec/frontend/vue_shared/issuable/create/components/issuable_label_selector_spec.js index a7fade4fc5c..94234a03664 100644 --- a/spec/frontend/vue_shared/issuable/create/components/issuable_label_selector_spec.js +++ b/spec/frontend/vue_shared/issuable/create/components/issuable_label_selector_spec.js @@ -16,8 +16,8 @@ const fullPath = '/full-path'; const labelsFilterBasePath = '/labels-filter-base-path'; const initialLabels = []; const issuableType = 'issue'; +const issuableSupportsLockOnMerge = false; const labelType = WORKSPACE_PROJECT; -const supportsLockOnMerge = false; const variant = VARIANT_EMBEDDED; const workspaceType = WORKSPACE_PROJECT; @@ -37,8 +37,8 @@ describe('IssuableLabelSelector', () => { labelsFilterBasePath, initialLabels, issuableType, + issuableSupportsLockOnMerge, labelType, - supportsLockOnMerge, variant, workspaceType, ...injectedProps, |