Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

1 files changed, 34 insertions, 0 deletions

diff --git a/spec/frontend/vue_shared/components/runner_instructions/runner_instructions_modal_spec.js b/spec/frontend/vue_shared/components/runner_instructions/runner_instructions_modal_spec.js
index 0da9939e97f..001b6ee4a6f 100644
--- a/spec/frontend/vue_shared/components/runner_instructions/runner_instructions_modal_spec.js
+++ b/spec/frontend/vue_shared/components/runner_instructions/runner_instructions_modal_spec.js
@@ -45,8 +45,10 @@ describe('RunnerInstructionsModal component', () => {
   const findSkeletonLoader = () => wrapper.findComponent(GlSkeletonLoader);
   const findGlLoadingIcon = () => wrapper.findComponent(GlLoadingIcon);
   const findAlert = () => wrapper.findComponent(GlAlert);
+  const findModal = () => wrapper.findComponent(GlModal);
   const findPlatformButtonGroup = () => wrapper.findByTestId('platform-buttons');
   const findPlatformButtons = () => findPlatformButtonGroup().findAllComponents(GlButton);
+  const findOsxPlatformButton = () => wrapper.find({ ref: 'osx' });
   const findArchitectureDropdownItems = () => wrapper.findAllByTestId('architecture-dropdown-item');
   const findBinaryInstructions = () => wrapper.findByTestId('binary-instructions');
   const findRegisterCommand = () => wrapper.findByTestId('register-command');
@@ -140,6 +142,38 @@ describe('RunnerInstructionsModal component', () => {
         expect(instructions).toBe(registerInstructions);
       });
     });
+
+    describe('when the modal is shown', () => {
+      it('sets the focus on the selected platform', () => {
+        findPlatformButtons().at(0).element.focus = jest.fn();
+
+        findModal().vm.$emit('shown');
+
+        expect(findPlatformButtons().at(0).element.focus).toHaveBeenCalled();
+      });
+    });
+
+    describe('when providing a defaultPlatformName', () => {
+      beforeEach(async () => {
+        createComponent({ props: { defaultPlatformName: 'osx' } });
+        await waitForPromises();
+      });
+
+      it('runner instructions for the default selected platform are requested', () => {
+        expect(runnerSetupInstructionsHandler).toHaveBeenCalledWith({
+          platform: 'osx',
+          architecture: 'amd64',
+        });
+      });
+
+      it('sets the focus on the default selected platform', () => {
+        findOsxPlatformButton().element.focus = jest.fn();
+
+        findModal().vm.$emit('shown');
+
+        expect(findOsxPlatformButton().element.focus).toHaveBeenCalled();
+      });
+    });
   });
 
   describe('after a platform and architecture are selected', () => {