Add latest changes from gitlab-org/gitlab@master

2 files changed, 32 insertions, 1 deletions

diff --git a/spec/frontend/ci/runner/components/runner_create_form_spec.js b/spec/frontend/ci/runner/components/runner_create_form_spec.js
index 329dd2f73ee..243d23aeb38 100644
--- a/spec/frontend/ci/runner/components/runner_create_form_spec.js
+++ b/spec/frontend/ci/runner/components/runner_create_form_spec.js
@@ -21,12 +21,14 @@ jest.mock('~/ci/runner/sentry_utils');
 const mockCreatedRunner = runnerCreateResult.data.runnerCreate.runner;
 
 const defaultRunnerModel = {
+  runnerType: INSTANCE_TYPE,
   description: '',
   accessLevel: DEFAULT_ACCESS_LEVEL,
   paused: false,
   maintenanceNote: '',
   maximumTimeout: '',
   runUntagged: false,
+  locked: false,
   tagList: '',
 };
 
@@ -81,6 +83,7 @@ describe('RunnerCreateForm', () => {
 
       findRunnerFormFields().vm.$emit('input', {
         ...defaultRunnerModel,
+        runnerType: props.runnerType,
         description: 'My runner',
         maximumTimeout: 0,
         tagList: 'tag1, tag2',
diff --git a/spec/frontend/ci/runner/components/runner_form_fields_spec.js b/spec/frontend/ci/runner/components/runner_form_fields_spec.js
index 5b429645d17..0e2f2aa2e91 100644
--- a/spec/frontend/ci/runner/components/runner_form_fields_spec.js
+++ b/spec/frontend/ci/runner/components/runner_form_fields_spec.js
@@ -1,7 +1,11 @@
 import { nextTick } from 'vue';
 import { mountExtended } from 'helpers/vue_test_utils_helper';
 import RunnerFormFields from '~/ci/runner/components/runner_form_fields.vue';
-import { ACCESS_LEVEL_NOT_PROTECTED, ACCESS_LEVEL_REF_PROTECTED } from '~/ci/runner/constants';
+import {
+  ACCESS_LEVEL_NOT_PROTECTED,
+  ACCESS_LEVEL_REF_PROTECTED,
+  PROJECT_TYPE,
+} from '~/ci/runner/constants';
 
 const mockDescription = 'My description';
 const mockMaxTimeout = 60;
@@ -63,6 +67,30 @@ describe('RunnerFormFields', () => {
     });
   });
 
+  it('locked checkbox is not shown', () => {
+    createComponent();
+
+    expect(findInput('locked').exists()).toBe(false);
+  });
+
+  it('when runner is of project type, locked checkbox can be checked', async () => {
+    createComponent({
+      runner: {
+        runnerType: PROJECT_TYPE,
+        locked: false,
+      },
+    });
+
+    findInput('locked').setChecked(true);
+
+    await nextTick();
+
+    expect(wrapper.emitted('input')[0][0]).toEqual({
+      runnerType: PROJECT_TYPE,
+      locked: true,
+    });
+  });
+
   it('unchecks checkbox fields', async () => {
     createComponent({
       runner: {