1 files changed, 19 insertions, 91 deletions
diff --git a/spec/frontend/vue_shared/components/runner_instructions/runner_instructions_spec.js b/spec/frontend/vue_shared/components/runner_instructions/runner_instructions_spec.js
index 48db60bfd33..23f8d6afcb5 100644
--- a/spec/frontend/vue_shared/components/runner_instructions/runner_instructions_spec.js
+++ b/spec/frontend/vue_shared/components/runner_instructions/runner_instructions_spec.js
@@ -1,113 +1,41 @@
-import { shallowMount, createLocalVue } from '@vue/test-utils';
-import VueApollo from 'vue-apollo';
-import createMockApollo from 'helpers/mock_apollo_helper';
-import getRunnerPlatforms from '~/vue_shared/components/runner_instructions/graphql/queries/get_runner_platforms.query.graphql';
-import getRunnerSetupInstructions from '~/vue_shared/components/runner_instructions/graphql/queries/get_runner_setup.query.graphql';
+import { shallowMount } from '@vue/test-utils';
+import { nextTick } from 'vue';
+import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 import RunnerInstructions from '~/vue_shared/components/runner_instructions/runner_instructions.vue';
-
-import { mockGraphqlRunnerPlatforms, mockGraphqlInstructions } from './mock_data';
-
-const projectPath = 'gitlab-org/gitlab';
-const localVue = createLocalVue();
-localVue.use(VueApollo);
+import RunnerInstructionsModal from '~/vue_shared/components/runner_instructions/runner_instructions_modal.vue';
 
 describe('RunnerInstructions component', () => {
   let wrapper;
-  let fakeApollo;
-
-  const findModalButton = () => wrapper.find('[data-testid="show-modal-button"]');
-  const findPlatformButtons = () => wrapper.findAll('[data-testid="platform-button"]');
-  const findArchitectureDropdownItems = () =>
-    wrapper.findAll('[data-testid="architecture-dropdown-item"]');
-  const findBinaryInstructionsSection = () => wrapper.find('[data-testid="binary-instructions"]');
-  const findRunnerInstructionsSection = () => wrapper.find('[data-testid="runner-instructions"]');
 
-  beforeEach(async () => {
-    const requestHandlers = [
-      [getRunnerPlatforms, jest.fn().mockResolvedValue(mockGraphqlRunnerPlatforms)],
-      [getRunnerSetupInstructions, jest.fn().mockResolvedValue(mockGraphqlInstructions)],
-    ];
+  const findModalButton = () => wrapper.findByTestId('show-modal-button');
+  const findModal = () => wrapper.findComponent(RunnerInstructionsModal);
 
-    fakeApollo = createMockApollo(requestHandlers);
+  const createComponent = () => {
+    wrapper = extendedWrapper(shallowMount(RunnerInstructions));
+  };
 
-    wrapper = shallowMount(RunnerInstructions, {
-      provide: {
-        projectPath,
-      },
-      localVue,
-      apolloProvider: fakeApollo,
-    });
-
-    await wrapper.vm.$nextTick();
+  beforeEach(() => {
+    createComponent();
   });
 
   afterEach(() => {
     wrapper.destroy();
-    wrapper = null;
   });
 
   it('should show the "Show Runner installation instructions" button', () => {
-    const button = findModalButton();
-
-    expect(button.exists()).toBe(true);
-    expect(button.text()).toBe('Show Runner installation instructions');
-  });
-
-  it('should contain a number of platforms buttons', () => {
-    const buttons = findPlatformButtons();
-
-    expect(buttons).toHaveLength(mockGraphqlRunnerPlatforms.data.runnerPlatforms.nodes.length);
-  });
-
-  it('should contain a number of dropdown items for the architecture options', () => {
-    const platformButton = findPlatformButtons().at(0);
-    platformButton.vm.$emit('click');
-
-    return wrapper.vm.$nextTick(() => {
-      const dropdownItems = findArchitectureDropdownItems();
-
-      expect(dropdownItems).toHaveLength(
-        mockGraphqlRunnerPlatforms.data.runnerPlatforms.nodes[0].architectures.nodes.length,
-      );
-    });
+    expect(findModalButton().exists()).toBe(true);
+    expect(findModalButton().text()).toBe('Show Runner installation instructions');
   });
 
-  it('should display the binary installation instructions for a selected architecture', async () => {
-    const platformButton = findPlatformButtons().at(0);
-    platformButton.vm.$emit('click');
-
-    await wrapper.vm.$nextTick();
-
-    const dropdownItem = findArchitectureDropdownItems().at(0);
-    dropdownItem.vm.$emit('click');
-
-    await wrapper.vm.$nextTick();
-
-    const runner = findBinaryInstructionsSection();
-
-    expect(runner.text()).toMatch('sudo chmod +x /usr/local/bin/gitlab-runner');
-    expect(runner.text()).toMatch(
-      `sudo useradd --comment 'GitLab Runner' --create-home gitlab-runner --shell /bin/bash`,
-    );
-    expect(runner.text()).toMatch(
-      'sudo gitlab-runner install --user=gitlab-runner --working-directory=/home/gitlab-runner',
-    );
-    expect(runner.text()).toMatch('sudo gitlab-runner start');
+  it('should not render the modal once mounted', () => {
+    expect(findModal().exists()).toBe(false);
   });
 
-  it('should display the runner register instructions for a selected architecture', async () => {
-    const platformButton = findPlatformButtons().at(0);
-    platformButton.vm.$emit('click');
-
-    await wrapper.vm.$nextTick();
-
-    const dropdownItem = findArchitectureDropdownItems().at(0);
-    dropdownItem.vm.$emit('click');
-
-    await wrapper.vm.$nextTick();
+  it('should render the modal once clicked', async () => {
+    findModalButton().vm.$emit('click');
 
-    const runner = findRunnerInstructionsSection();
+    await nextTick();
 
-    expect(runner.text()).toMatch(mockGraphqlInstructions.data.runnerSetup.registerInstructions);
+    expect(findModal().exists()).toBe(true);
   });
 });