diff options
Diffstat (limited to 'spec/frontend/runner/group_runners/group_runners_app_spec.js')
| -rw-r--r-- | spec/frontend/runner/group_runners/group_runners_app_spec.js | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/spec/frontend/runner/group_runners/group_runners_app_spec.js b/spec/frontend/runner/group_runners/group_runners_app_spec.js index 5f3aabd4bc3..39bca743c80 100644 --- a/spec/frontend/runner/group_runners/group_runners_app_spec.js +++ b/spec/frontend/runner/group_runners/group_runners_app_spec.js @@ -1,3 +1,4 @@ +import { nextTick } from 'vue'; import { GlLink } from '@gitlab/ui'; import { createLocalVue, shallowMount, mount } from '@vue/test-utils'; import VueApollo from 'vue-apollo'; @@ -11,7 +12,7 @@ import { updateHistory } from '~/lib/utils/url_utility'; import RunnerFilteredSearchBar from '~/runner/components/runner_filtered_search_bar.vue'; import RunnerList from '~/runner/components/runner_list.vue'; -import RunnerManualSetupHelp from '~/runner/components/runner_manual_setup_help.vue'; +import RegistrationDropdown from '~/runner/components/registration/registration_dropdown.vue'; import RunnerPagination from '~/runner/components/runner_pagination.vue'; import { @@ -19,8 +20,8 @@ import { CREATED_DESC, DEFAULT_SORT, INSTANCE_TYPE, + GROUP_TYPE, PARAM_KEY_STATUS, - PARAM_KEY_RUNNER_TYPE, STATUS_ACTIVE, RUNNER_PAGE_SIZE, } from '~/runner/constants'; @@ -48,7 +49,7 @@ describe('GroupRunnersApp', () => { let wrapper; let mockGroupRunnersQuery; - const findRunnerManualSetupHelp = () => wrapper.findComponent(RunnerManualSetupHelp); + const findRegistrationDropdown = () => wrapper.findComponent(RegistrationDropdown); const findRunnerList = () => wrapper.findComponent(RunnerList); const findRunnerPagination = () => extendedWrapper(wrapper.findComponent(RunnerPagination)); const findRunnerPaginationPrev = () => @@ -82,13 +83,13 @@ describe('GroupRunnersApp', () => { }); it('shows the runner setup instructions', () => { - expect(findRunnerManualSetupHelp().props('registrationToken')).toBe(mockRegistrationToken); + expect(findRegistrationDropdown().props('registrationToken')).toBe(mockRegistrationToken); + expect(findRegistrationDropdown().props('type')).toBe(GROUP_TYPE); }); it('shows the runners list', () => { - expect(findRunnerList().props('runners')).toEqual( - groupRunnersData.data.group.runners.edges.map(({ node }) => node), - ); + const runners = findRunnerList().props('runners'); + expect(runners).toEqual(groupRunnersData.data.group.runners.edges.map(({ node }) => node)); }); it('runner item links to the runner group page', async () => { @@ -117,16 +118,15 @@ describe('GroupRunnersApp', () => { it('sets tokens in the filtered search', () => { createComponent({ mountFn: mount }); - expect(findFilteredSearch().props('tokens')).toEqual([ + const tokens = findFilteredSearch().props('tokens'); + + expect(tokens).toHaveLength(1); + expect(tokens[0]).toEqual( expect.objectContaining({ type: PARAM_KEY_STATUS, options: expect.any(Array), }), - expect.objectContaining({ - type: PARAM_KEY_RUNNER_TYPE, - options: expect.any(Array), - }), - ]); + ); }); describe('shows the active runner count', () => { @@ -161,10 +161,8 @@ describe('GroupRunnersApp', () => { it('sets the filters in the search bar', () => { expect(findRunnerFilteredSearchBar().props('value')).toEqual({ - filters: [ - { type: 'status', value: { data: STATUS_ACTIVE, operator: '=' } }, - { type: 'runner_type', value: { data: INSTANCE_TYPE, operator: '=' } }, - ], + runnerType: INSTANCE_TYPE, + filters: [{ type: 'status', value: { data: STATUS_ACTIVE, operator: '=' } }], sort: 'CREATED_DESC', pagination: { page: 1 }, }); @@ -182,11 +180,14 @@ describe('GroupRunnersApp', () => { }); describe('when a filter is selected by the user', () => { - beforeEach(() => { + beforeEach(async () => { findRunnerFilteredSearchBar().vm.$emit('input', { + runnerType: null, filters: [{ type: PARAM_KEY_STATUS, value: { data: STATUS_ACTIVE, operator: '=' } }], sort: CREATED_ASC, }); + + await nextTick(); }); it('updates the browser url', () => { |