diff options
Diffstat (limited to 'spec/frontend/feature_flags')
27 files changed, 112 insertions, 104 deletions
diff --git a/spec/frontend/feature_flags/components/configure_feature_flags_modal_spec.js b/spec/frontend/feature_flags/components/configure_feature_flags_modal_spec.js index 21b894ccbef..84e71ffd204 100644 --- a/spec/frontend/feature_flags/components/configure_feature_flags_modal_spec.js +++ b/spec/frontend/feature_flags/components/configure_feature_flags_modal_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlModal, GlSprintf, GlAlert } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import Component from '~/feature_flags/components/configure_feature_flags_modal.vue'; describe('Configure Feature Flags Modal', () => { diff --git a/spec/frontend/feature_flags/components/edit_feature_flag_spec.js b/spec/frontend/feature_flags/components/edit_feature_flag_spec.js index a754c682356..e2717b98ea9 100644 --- a/spec/frontend/feature_flags/components/edit_feature_flag_spec.js +++ b/spec/frontend/feature_flags/components/edit_feature_flag_spec.js @@ -1,13 +1,13 @@ -import Vuex from 'vuex'; +import { GlToggle, GlAlert } from '@gitlab/ui'; import { createLocalVue, shallowMount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; -import { GlToggle, GlAlert } from '@gitlab/ui'; -import { TEST_HOST } from 'spec/test_constants'; +import Vuex from 'vuex'; import { mockTracking } from 'helpers/tracking_helper'; -import { LEGACY_FLAG, NEW_VERSION_FLAG } from '~/feature_flags/constants'; +import { TEST_HOST } from 'spec/test_constants'; +import EditFeatureFlag from '~/feature_flags/components/edit_feature_flag.vue'; import Form from '~/feature_flags/components/form.vue'; +import { LEGACY_FLAG, NEW_VERSION_FLAG } from '~/feature_flags/constants'; import createStore from '~/feature_flags/store/edit'; -import EditFeatureFlag from '~/feature_flags/components/edit_feature_flag.vue'; import axios from '~/lib/utils/axios_utils'; const localVue = createLocalVue(); @@ -75,6 +75,8 @@ describe('Edit feature flag form', () => { }); const findAlert = () => wrapper.find(GlAlert); + const findWarningGlAlert = () => + wrapper.findAll(GlAlert).filter((c) => c.props('variant') === 'warning'); it('should display the iid', () => { expect(wrapper.find('h3').text()).toContain('^5'); @@ -88,7 +90,7 @@ describe('Edit feature flag form', () => { expect(wrapper.find(GlToggle).props('value')).toBe(true); }); - it('should not alert users that feature flags are changing soon', () => { + it('should alert users the flag is read only', () => { expect(findAlert().text()).toContain('GitLab is moving to a new way of managing feature flags'); }); @@ -96,8 +98,9 @@ describe('Edit feature flag form', () => { it('should render the error', () => { store.dispatch('receiveUpdateFeatureFlagError', { message: ['The name is required'] }); return wrapper.vm.$nextTick(() => { - expect(wrapper.find('.alert-danger').exists()).toEqual(true); - expect(wrapper.find('.alert-danger').text()).toContain('The name is required'); + const warningGlAlert = findWarningGlAlert(); + expect(warningGlAlert.at(1).exists()).toEqual(true); + expect(warningGlAlert.at(1).text()).toContain('The name is required'); }); }); }); diff --git a/spec/frontend/feature_flags/components/environments_dropdown_spec.js b/spec/frontend/feature_flags/components/environments_dropdown_spec.js index 042fccaa369..9194db3a182 100644 --- a/spec/frontend/feature_flags/components/environments_dropdown_spec.js +++ b/spec/frontend/feature_flags/components/environments_dropdown_spec.js @@ -1,8 +1,8 @@ -import MockAdapter from 'axios-mock-adapter'; -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon, GlButton, GlSearchBoxByType } from '@gitlab/ui'; -import { TEST_HOST } from 'spec/test_constants'; +import { shallowMount } from '@vue/test-utils'; +import MockAdapter from 'axios-mock-adapter'; import waitForPromises from 'helpers/wait_for_promises'; +import { TEST_HOST } from 'spec/test_constants'; import EnvironmentsDropdown from '~/feature_flags/components/environments_dropdown.vue'; import axios from '~/lib/utils/axios_utils'; import httpStatusCodes from '~/lib/utils/http_status'; diff --git a/spec/frontend/feature_flags/components/feature_flags_spec.js b/spec/frontend/feature_flags/components/feature_flags_spec.js index 8242d667d2e..b519aab0dc4 100644 --- a/spec/frontend/feature_flags/components/feature_flags_spec.js +++ b/spec/frontend/feature_flags/components/feature_flags_spec.js @@ -1,18 +1,18 @@ +import { GlAlert, GlEmptyState, GlLoadingIcon, GlSprintf } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; -import Vuex from 'vuex'; import MockAdapter from 'axios-mock-adapter'; -import { GlAlert, GlEmptyState, GlLoadingIcon, GlSprintf } from '@gitlab/ui'; +import Vuex from 'vuex'; import { TEST_HOST } from 'spec/test_constants'; import Api from '~/api'; -import createStore from '~/feature_flags/store/index'; -import FeatureFlagsTab from '~/feature_flags/components/feature_flags_tab.vue'; +import ConfigureFeatureFlagsModal from '~/feature_flags/components/configure_feature_flags_modal.vue'; import FeatureFlagsComponent from '~/feature_flags/components/feature_flags.vue'; +import FeatureFlagsTab from '~/feature_flags/components/feature_flags_tab.vue'; import FeatureFlagsTable from '~/feature_flags/components/feature_flags_table.vue'; import UserListsTable from '~/feature_flags/components/user_lists_table.vue'; -import ConfigureFeatureFlagsModal from '~/feature_flags/components/configure_feature_flags_modal.vue'; import { FEATURE_FLAG_SCOPE, USER_LIST_SCOPE } from '~/feature_flags/constants'; -import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue'; +import createStore from '~/feature_flags/store/index'; import axios from '~/lib/utils/axios_utils'; +import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue'; import { getRequestData, userList } from '../mock_data'; const localVue = createLocalVue(); diff --git a/spec/frontend/feature_flags/components/feature_flags_tab_spec.js b/spec/frontend/feature_flags/components/feature_flags_tab_spec.js index 23cc7045d1f..c2170e8a768 100644 --- a/spec/frontend/feature_flags/components/feature_flags_tab_spec.js +++ b/spec/frontend/feature_flags/components/feature_flags_tab_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlAlert, GlBadge, GlEmptyState, GlLink, GlLoadingIcon, GlTabs } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import FeatureFlagsTab from '~/feature_flags/components/feature_flags_tab.vue'; const DEFAULT_PROPS = { diff --git a/spec/frontend/feature_flags/components/feature_flags_table_spec.js b/spec/frontend/feature_flags/components/feature_flags_table_spec.js index 8881cfae88d..8f4d39d4a11 100644 --- a/spec/frontend/feature_flags/components/feature_flags_table_spec.js +++ b/spec/frontend/feature_flags/components/feature_flags_table_spec.js @@ -1,7 +1,8 @@ -import { shallowMount } from '@vue/test-utils'; import { GlToggle, GlBadge } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { trimText } from 'helpers/text_helper'; import { mockTracking } from 'helpers/tracking_helper'; +import FeatureFlagsTable from '~/feature_flags/components/feature_flags_table.vue'; import { ROLLOUT_STRATEGY_ALL_USERS, ROLLOUT_STRATEGY_PERCENT_ROLLOUT, @@ -11,7 +12,6 @@ import { LEGACY_FLAG, DEFAULT_PERCENT_ROLLOUT, } from '~/feature_flags/constants'; -import FeatureFlagsTable from '~/feature_flags/components/feature_flags_table.vue'; const getDefaultProps = () => ({ featureFlags: [ diff --git a/spec/frontend/feature_flags/components/form_spec.js b/spec/frontend/feature_flags/components/form_spec.js index 3a057aedde9..a05e23a4250 100644 --- a/spec/frontend/feature_flags/components/form_spec.js +++ b/spec/frontend/feature_flags/components/form_spec.js @@ -1,9 +1,10 @@ -import { uniqueId } from 'lodash'; +import { GlFormTextarea, GlFormCheckbox, GlButton, GlToggle } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; -import { GlFormTextarea, GlFormCheckbox, GlButton } from '@gitlab/ui'; +import { uniqueId } from 'lodash'; +import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import Api from '~/api'; -import Form from '~/feature_flags/components/form.vue'; import EnvironmentsDropdown from '~/feature_flags/components/environments_dropdown.vue'; +import Form from '~/feature_flags/components/form.vue'; import Strategy from '~/feature_flags/components/strategy.vue'; import { ROLLOUT_STRATEGY_ALL_USERS, @@ -14,7 +15,6 @@ import { NEW_VERSION_FLAG, } from '~/feature_flags/constants'; import RelatedIssuesRoot from '~/related_issues/components/related_issues_root.vue'; -import ToggleButton from '~/vue_shared/components/toggle_button.vue'; import { featureFlag, userList, allUsersStrategy } from '../mock_data'; jest.mock('~/api.js'); @@ -35,14 +35,19 @@ describe('feature flag form', () => { }, }; + const findAddNewScopeRow = () => wrapper.findByTestId('add-new-scope'); + const findGlToggle = () => wrapper.find(GlToggle); + const factory = (props = {}, provide = {}) => { - wrapper = shallowMount(Form, { - propsData: { ...requiredProps, ...props }, - provide: { - ...requiredInjections, - ...provide, - }, - }); + wrapper = extendedWrapper( + shallowMount(Form, { + propsData: { ...requiredProps, ...props }, + provide: { + ...requiredInjections, + ...provide, + }, + }), + ); }; beforeEach(() => { @@ -102,13 +107,13 @@ describe('feature flag form', () => { }); it('should render scopes table with a new row ', () => { - expect(wrapper.find('.js-add-new-scope').exists()).toBe(true); + expect(findAddNewScopeRow().exists()).toBe(true); }); describe('status toggle', () => { describe('without filled text input', () => { it('should add a new scope with the text value empty and the status', () => { - wrapper.find(ToggleButton).vm.$emit('change', true); + findGlToggle().vm.$emit('change', true); expect(wrapper.vm.formScopes).toHaveLength(1); expect(wrapper.vm.formScopes[0].active).toEqual(true); @@ -121,7 +126,7 @@ describe('feature flag form', () => { it('should be disabled if the feature flag is not active', (done) => { wrapper.setProps({ active: false }); wrapper.vm.$nextTick(() => { - expect(wrapper.find(ToggleButton).props('disabledInput')).toBe(true); + expect(findGlToggle().props('disabled')).toBe(true); done(); }); }); @@ -166,11 +171,11 @@ describe('feature flag form', () => { describe('scopes', () => { it('should be possible to remove a scope', () => { - expect(wrapper.find('.js-feature-flag-delete').exists()).toEqual(true); + expect(wrapper.findByTestId('feature-flag-delete').exists()).toEqual(true); }); it('renders empty row to add a new scope', () => { - expect(wrapper.find('.js-add-new-scope').exists()).toEqual(true); + expect(findAddNewScopeRow().exists()).toEqual(true); }); it('renders the user id checkbox', () => { @@ -186,7 +191,7 @@ describe('feature flag form', () => { describe('update scope', () => { describe('on click on toggle', () => { it('should update the scope', () => { - wrapper.find(ToggleButton).vm.$emit('change', false); + findGlToggle().vm.$emit('change', false); expect(wrapper.vm.formScopes[0].active).toBe(false); }); @@ -195,7 +200,7 @@ describe('feature flag form', () => { wrapper.setProps({ active: false }); wrapper.vm.$nextTick(() => { - expect(wrapper.find(ToggleButton).props('disabledInput')).toBe(true); + expect(findGlToggle().props('disabled')).toBe(true); done(); }); }); @@ -294,7 +299,7 @@ describe('feature flag form', () => { const row = wrapper.findAll('.gl-responsive-table-row').at(2); expect(row.find(EnvironmentsDropdown).vm.disabled).toBe(true); - expect(row.find(ToggleButton).vm.disabledInput).toBe(true); + expect(row.find(GlToggle).props('disabled')).toBe(true); expect(row.find('.js-delete-scope').exists()).toBe(false); }); }); @@ -347,10 +352,10 @@ describe('feature flag form', () => { return wrapper.vm.$nextTick(); }) .then(() => { - wrapper.find('.js-add-new-scope').find(ToggleButton).vm.$emit('change', true); + findAddNewScopeRow().find(GlToggle).vm.$emit('change', true); }) .then(() => { - wrapper.find(ToggleButton).vm.$emit('change', true); + findGlToggle().vm.$emit('change', true); return wrapper.vm.$nextTick(); }) diff --git a/spec/frontend/feature_flags/components/new_environments_dropdown_spec.js b/spec/frontend/feature_flags/components/new_environments_dropdown_spec.js index ad58ceaf5f8..6342ac0bda7 100644 --- a/spec/frontend/feature_flags/components/new_environments_dropdown_spec.js +++ b/spec/frontend/feature_flags/components/new_environments_dropdown_spec.js @@ -1,6 +1,6 @@ +import { GlLoadingIcon, GlSearchBoxByType, GlDropdownItem } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; -import { GlLoadingIcon, GlSearchBoxByType, GlDropdownItem } from '@gitlab/ui'; import NewEnvironmentsDropdown from '~/feature_flags/components/new_environments_dropdown.vue'; import axios from '~/lib/utils/axios_utils'; import httpStatusCodes from '~/lib/utils/http_status'; diff --git a/spec/frontend/feature_flags/components/new_feature_flag_spec.js b/spec/frontend/feature_flags/components/new_feature_flag_spec.js index e317ac4b092..e209c14d8c7 100644 --- a/spec/frontend/feature_flags/components/new_feature_flag_spec.js +++ b/spec/frontend/feature_flags/components/new_feature_flag_spec.js @@ -1,11 +1,11 @@ +import { GlAlert } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import { GlAlert } from '@gitlab/ui'; import { TEST_HOST } from 'spec/test_constants'; import Form from '~/feature_flags/components/form.vue'; -import createStore from '~/feature_flags/store/new'; import NewFeatureFlag from '~/feature_flags/components/new_feature_flag.vue'; import { ROLLOUT_STRATEGY_ALL_USERS, DEFAULT_PERCENT_ROLLOUT } from '~/feature_flags/constants'; +import createStore from '~/feature_flags/store/new'; import { allUsersStrategy } from '../mock_data'; const userCalloutId = 'feature_flags_new_version'; @@ -41,6 +41,9 @@ describe('New feature flag form', () => { }); }; + const findWarningGlAlert = () => + wrapper.findAll(GlAlert).filter((c) => c.props('variant') === 'warning'); + beforeEach(() => { factory(); }); @@ -53,8 +56,9 @@ describe('New feature flag form', () => { it('should render the error', () => { store.dispatch('receiveCreateFeatureFlagError', { message: ['The name is required'] }); return wrapper.vm.$nextTick(() => { - expect(wrapper.find('.alert').exists()).toEqual(true); - expect(wrapper.find('.alert').text()).toContain('The name is required'); + const warningGlAlert = findWarningGlAlert(); + expect(warningGlAlert.at(0).exists()).toBe(true); + expect(warningGlAlert.at(0).text()).toContain('The name is required'); }); }); }); @@ -81,10 +85,6 @@ describe('New feature flag form', () => { expect(wrapper.find(Form).props('scopes')).toContainEqual(defaultScope); }); - it('should not alert users that feature flags are changing soon', () => { - expect(wrapper.find(GlAlert).exists()).toBe(false); - }); - it('has an all users strategy by default', () => { const strategies = wrapper.find(Form).props('strategies'); diff --git a/spec/frontend/feature_flags/components/strategies/flexible_rollout_spec.js b/spec/frontend/feature_flags/components/strategies/flexible_rollout_spec.js index 725f53d4409..02216370b79 100644 --- a/spec/frontend/feature_flags/components/strategies/flexible_rollout_spec.js +++ b/spec/frontend/feature_flags/components/strategies/flexible_rollout_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlFormInput, GlFormSelect } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import FlexibleRollout from '~/feature_flags/components/strategies/flexible_rollout.vue'; import ParameterFormGroup from '~/feature_flags/components/strategies/parameter_form_group.vue'; import { PERCENT_ROLLOUT_GROUP_ID } from '~/feature_flags/constants'; diff --git a/spec/frontend/feature_flags/components/strategies/gitlab_user_list_spec.js b/spec/frontend/feature_flags/components/strategies/gitlab_user_list_spec.js index 1c85eadc678..6188672b23b 100644 --- a/spec/frontend/feature_flags/components/strategies/gitlab_user_list_spec.js +++ b/spec/frontend/feature_flags/components/strategies/gitlab_user_list_spec.js @@ -1,9 +1,9 @@ +import { GlDropdown, GlDropdownItem, GlSearchBoxByType, GlLoadingIcon } from '@gitlab/ui'; import { mount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import { GlDropdown, GlDropdownItem, GlSearchBoxByType, GlLoadingIcon } from '@gitlab/ui'; import Api from '~/api'; -import createStore from '~/feature_flags/store/new'; import GitlabUserList from '~/feature_flags/components/strategies/gitlab_user_list.vue'; +import createStore from '~/feature_flags/store/new'; import { userListStrategy, userList } from '../../mock_data'; jest.mock('~/api'); diff --git a/spec/frontend/feature_flags/components/strategies/parameter_form_group_spec.js b/spec/frontend/feature_flags/components/strategies/parameter_form_group_spec.js index a0ffdb1fca0..33696064d55 100644 --- a/spec/frontend/feature_flags/components/strategies/parameter_form_group_spec.js +++ b/spec/frontend/feature_flags/components/strategies/parameter_form_group_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlFormGroup, GlFormInput } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import ParameterFormGroup from '~/feature_flags/components/strategies/parameter_form_group.vue'; describe('~/feature_flags/strategies/parameter_form_group.vue', () => { diff --git a/spec/frontend/feature_flags/components/strategies/percent_rollout_spec.js b/spec/frontend/feature_flags/components/strategies/percent_rollout_spec.js index 696b3b2e4c9..442f7faf161 100644 --- a/spec/frontend/feature_flags/components/strategies/percent_rollout_spec.js +++ b/spec/frontend/feature_flags/components/strategies/percent_rollout_spec.js @@ -1,7 +1,7 @@ -import { mount } from '@vue/test-utils'; import { GlFormInput } from '@gitlab/ui'; -import PercentRollout from '~/feature_flags/components/strategies/percent_rollout.vue'; +import { mount } from '@vue/test-utils'; import ParameterFormGroup from '~/feature_flags/components/strategies/parameter_form_group.vue'; +import PercentRollout from '~/feature_flags/components/strategies/percent_rollout.vue'; import { PERCENT_ROLLOUT_GROUP_ID } from '~/feature_flags/constants'; import { percentRolloutStrategy } from '../../mock_data'; diff --git a/spec/frontend/feature_flags/components/strategies/users_with_id_spec.js b/spec/frontend/feature_flags/components/strategies/users_with_id_spec.js index 460df6ef2ec..745fbca00fe 100644 --- a/spec/frontend/feature_flags/components/strategies/users_with_id_spec.js +++ b/spec/frontend/feature_flags/components/strategies/users_with_id_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlFormTextarea } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import UsersWithId from '~/feature_flags/components/strategies/users_with_id.vue'; import { usersWithIdStrategy } from '../../mock_data'; diff --git a/spec/frontend/feature_flags/components/strategy_parameters_spec.js b/spec/frontend/feature_flags/components/strategy_parameters_spec.js index 82811c05195..979ca255b08 100644 --- a/spec/frontend/feature_flags/components/strategy_parameters_spec.js +++ b/spec/frontend/feature_flags/components/strategy_parameters_spec.js @@ -1,16 +1,16 @@ import { shallowMount } from '@vue/test-utils'; import { last } from 'lodash'; +import Default from '~/feature_flags/components/strategies/default.vue'; +import GitlabUserList from '~/feature_flags/components/strategies/gitlab_user_list.vue'; +import PercentRollout from '~/feature_flags/components/strategies/percent_rollout.vue'; +import UsersWithId from '~/feature_flags/components/strategies/users_with_id.vue'; +import StrategyParameters from '~/feature_flags/components/strategy_parameters.vue'; import { ROLLOUT_STRATEGY_ALL_USERS, ROLLOUT_STRATEGY_PERCENT_ROLLOUT, ROLLOUT_STRATEGY_USER_ID, ROLLOUT_STRATEGY_GITLAB_USER_LIST, } from '~/feature_flags/constants'; -import Default from '~/feature_flags/components/strategies/default.vue'; -import GitlabUserList from '~/feature_flags/components/strategies/gitlab_user_list.vue'; -import PercentRollout from '~/feature_flags/components/strategies/percent_rollout.vue'; -import UsersWithId from '~/feature_flags/components/strategies/users_with_id.vue'; -import StrategyParameters from '~/feature_flags/components/strategy_parameters.vue'; import { allUsersStrategy } from '../mock_data'; const DEFAULT_PROPS = { diff --git a/spec/frontend/feature_flags/components/strategy_spec.js b/spec/frontend/feature_flags/components/strategy_spec.js index 67cf70c37e2..4fdf436bfc4 100644 --- a/spec/frontend/feature_flags/components/strategy_spec.js +++ b/spec/frontend/feature_flags/components/strategy_spec.js @@ -1,9 +1,11 @@ +import { GlAlert, GlFormSelect, GlLink, GlToken, GlButton } from '@gitlab/ui'; import { mount, createLocalVue } from '@vue/test-utils'; -import Vuex from 'vuex'; import { last } from 'lodash'; -import { GlAlert, GlFormSelect, GlLink, GlToken, GlButton } from '@gitlab/ui'; +import Vuex from 'vuex'; import Api from '~/api'; -import createStore from '~/feature_flags/store/new'; +import NewEnvironmentsDropdown from '~/feature_flags/components/new_environments_dropdown.vue'; +import Strategy from '~/feature_flags/components/strategy.vue'; +import StrategyParameters from '~/feature_flags/components/strategy_parameters.vue'; import { PERCENT_ROLLOUT_GROUP_ID, ROLLOUT_STRATEGY_ALL_USERS, @@ -12,9 +14,7 @@ import { ROLLOUT_STRATEGY_USER_ID, ROLLOUT_STRATEGY_GITLAB_USER_LIST, } from '~/feature_flags/constants'; -import Strategy from '~/feature_flags/components/strategy.vue'; -import NewEnvironmentsDropdown from '~/feature_flags/components/new_environments_dropdown.vue'; -import StrategyParameters from '~/feature_flags/components/strategy_parameters.vue'; +import createStore from '~/feature_flags/store/new'; import { userList } from '../mock_data'; diff --git a/spec/frontend/feature_flags/components/user_lists_table_spec.js b/spec/frontend/feature_flags/components/user_lists_table_spec.js index 974f63ba934..1b04ecee146 100644 --- a/spec/frontend/feature_flags/components/user_lists_table_spec.js +++ b/spec/frontend/feature_flags/components/user_lists_table_spec.js @@ -1,6 +1,6 @@ +import { GlModal } from '@gitlab/ui'; import { mount } from '@vue/test-utils'; import * as timeago from 'timeago.js'; -import { GlModal } from '@gitlab/ui'; import UserListsTable from '~/feature_flags/components/user_lists_table.vue'; import { userList } from '../mock_data'; diff --git a/spec/frontend/feature_flags/store/edit/actions_spec.js b/spec/frontend/feature_flags/store/edit/actions_spec.js index 20cec5daac0..afcac53468c 100644 --- a/spec/frontend/feature_flags/store/edit/actions_spec.js +++ b/spec/frontend/feature_flags/store/edit/actions_spec.js @@ -2,6 +2,11 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; import { TEST_HOST } from 'spec/test_constants'; import { + NEW_VERSION_FLAG, + LEGACY_FLAG, + ROLLOUT_STRATEGY_ALL_USERS, +} from '~/feature_flags/constants'; +import { updateFeatureFlag, requestUpdateFeatureFlag, receiveUpdateFeatureFlagSuccess, @@ -12,14 +17,9 @@ import { receiveFeatureFlagError, toggleActive, } from '~/feature_flags/store/edit/actions'; +import * as types from '~/feature_flags/store/edit/mutation_types'; import state from '~/feature_flags/store/edit/state'; import { mapStrategiesToRails, mapFromScopesViewModel } from '~/feature_flags/store/helpers'; -import { - NEW_VERSION_FLAG, - LEGACY_FLAG, - ROLLOUT_STRATEGY_ALL_USERS, -} from '~/feature_flags/constants'; -import * as types from '~/feature_flags/store/edit/mutation_types'; import axios from '~/lib/utils/axios_utils'; jest.mock('~/lib/utils/url_utility'); diff --git a/spec/frontend/feature_flags/store/edit/mutations_spec.js b/spec/frontend/feature_flags/store/edit/mutations_spec.js index 1d817fb8004..4b43f8b82df 100644 --- a/spec/frontend/feature_flags/store/edit/mutations_spec.js +++ b/spec/frontend/feature_flags/store/edit/mutations_spec.js @@ -1,6 +1,6 @@ -import state from '~/feature_flags/store/edit/state'; -import mutations from '~/feature_flags/store/edit/mutations'; import * as types from '~/feature_flags/store/edit/mutation_types'; +import mutations from '~/feature_flags/store/edit/mutations'; +import state from '~/feature_flags/store/edit/state'; describe('Feature flags Edit Module Mutations', () => { let stateCopy; diff --git a/spec/frontend/feature_flags/store/gitlab_user_lists/actions_spec.js b/spec/frontend/feature_flags/store/gitlab_user_lists/actions_spec.js index aba578cca59..b4887d23e4b 100644 --- a/spec/frontend/feature_flags/store/gitlab_user_lists/actions_spec.js +++ b/spec/frontend/feature_flags/store/gitlab_user_lists/actions_spec.js @@ -1,8 +1,8 @@ import testAction from 'helpers/vuex_action_helper'; import Api from '~/api'; -import createState from '~/feature_flags/store/gitlab_user_list/state'; import { fetchUserLists, setFilter } from '~/feature_flags/store/gitlab_user_list/actions'; import * as types from '~/feature_flags/store/gitlab_user_list/mutation_types'; +import createState from '~/feature_flags/store/gitlab_user_list/state'; import { userList } from '../../mock_data'; jest.mock('~/api'); diff --git a/spec/frontend/feature_flags/store/gitlab_user_lists/getters_spec.js b/spec/frontend/feature_flags/store/gitlab_user_lists/getters_spec.js index e267cd59f50..1f02cbb44a1 100644 --- a/spec/frontend/feature_flags/store/gitlab_user_lists/getters_spec.js +++ b/spec/frontend/feature_flags/store/gitlab_user_lists/getters_spec.js @@ -4,8 +4,8 @@ import { isLoading, hasError, } from '~/feature_flags/store/gitlab_user_list/getters'; -import statuses from '~/feature_flags/store/gitlab_user_list/status'; import createState from '~/feature_flags/store/gitlab_user_list/state'; +import statuses from '~/feature_flags/store/gitlab_user_list/status'; import { userList } from '../../mock_data'; describe('~/feature_flags/store/gitlab_user_list/getters', () => { diff --git a/spec/frontend/feature_flags/store/gitlab_user_lists/mutations_spec.js b/spec/frontend/feature_flags/store/gitlab_user_lists/mutations_spec.js index 88d4554a227..46233c43b07 100644 --- a/spec/frontend/feature_flags/store/gitlab_user_lists/mutations_spec.js +++ b/spec/frontend/feature_flags/store/gitlab_user_lists/mutations_spec.js @@ -1,7 +1,7 @@ -import statuses from '~/feature_flags/store/gitlab_user_list/status'; -import createState from '~/feature_flags/store/gitlab_user_list/state'; import * as types from '~/feature_flags/store/gitlab_user_list/mutation_types'; import mutations from '~/feature_flags/store/gitlab_user_list/mutations'; +import createState from '~/feature_flags/store/gitlab_user_list/state'; +import statuses from '~/feature_flags/store/gitlab_user_list/status'; import { userList } from '../../mock_data'; describe('~/feature_flags/store/gitlab_user_list/mutations', () => { diff --git a/spec/frontend/feature_flags/store/helpers_spec.js b/spec/frontend/feature_flags/store/helpers_spec.js index 301b1d09fcc..711e2a1286e 100644 --- a/spec/frontend/feature_flags/store/helpers_spec.js +++ b/spec/frontend/feature_flags/store/helpers_spec.js @@ -1,12 +1,5 @@ import { uniqueId } from 'lodash'; import { - mapToScopesViewModel, - mapFromScopesViewModel, - createNewEnvironmentScope, - mapStrategiesToViewModel, - mapStrategiesToRails, -} from '~/feature_flags/store/helpers'; -import { ROLLOUT_STRATEGY_ALL_USERS, ROLLOUT_STRATEGY_PERCENT_ROLLOUT, ROLLOUT_STRATEGY_USER_ID, @@ -16,6 +9,13 @@ import { LEGACY_FLAG, NEW_VERSION_FLAG, } from '~/feature_flags/constants'; +import { + mapToScopesViewModel, + mapFromScopesViewModel, + createNewEnvironmentScope, + mapStrategiesToViewModel, + mapStrategiesToRails, +} from '~/feature_flags/store/helpers'; describe('feature flags helpers spec', () => { describe('mapToScopesViewModel', () => { diff --git a/spec/frontend/feature_flags/store/index/actions_spec.js b/spec/frontend/feature_flags/store/index/actions_spec.js index 82e16958d33..a7ab2e92cb2 100644 --- a/spec/frontend/feature_flags/store/index/actions_spec.js +++ b/spec/frontend/feature_flags/store/index/actions_spec.js @@ -2,6 +2,7 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; import { TEST_HOST } from 'spec/test_constants'; import Api from '~/api'; +import { mapToScopesViewModel } from '~/feature_flags/store/helpers'; import { requestFeatureFlags, receiveFeatureFlagsSuccess, @@ -24,9 +25,8 @@ import { receiveDeleteUserListError, clearAlert, } from '~/feature_flags/store/index/actions'; -import { mapToScopesViewModel } from '~/feature_flags/store/helpers'; -import state from '~/feature_flags/store/index/state'; import * as types from '~/feature_flags/store/index/mutation_types'; +import state from '~/feature_flags/store/index/state'; import axios from '~/lib/utils/axios_utils'; import { getRequestData, rotateData, featureFlag, userList } from '../../mock_data'; diff --git a/spec/frontend/feature_flags/store/index/mutations_spec.js b/spec/frontend/feature_flags/store/index/mutations_spec.js index eec56800a8d..08b5868d1b4 100644 --- a/spec/frontend/feature_flags/store/index/mutations_spec.js +++ b/spec/frontend/feature_flags/store/index/mutations_spec.js @@ -1,7 +1,7 @@ -import state from '~/feature_flags/store/index/state'; -import mutations from '~/feature_flags/store/index/mutations'; -import * as types from '~/feature_flags/store/index/mutation_types'; import { mapToScopesViewModel } from '~/feature_flags/store/helpers'; +import * as types from '~/feature_flags/store/index/mutation_types'; +import mutations from '~/feature_flags/store/index/mutations'; +import state from '~/feature_flags/store/index/state'; import { parseIntPagination, normalizeHeaders } from '~/lib/utils/common_utils'; import { getRequestData, rotateData, featureFlag, userList } from '../../mock_data'; diff --git a/spec/frontend/feature_flags/store/new/actions_spec.js b/spec/frontend/feature_flags/store/new/actions_spec.js index 9168f11fdfb..00dfb982ded 100644 --- a/spec/frontend/feature_flags/store/new/actions_spec.js +++ b/spec/frontend/feature_flags/store/new/actions_spec.js @@ -2,20 +2,20 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; import { TEST_HOST } from 'spec/test_constants'; import { - createFeatureFlag, - requestCreateFeatureFlag, - receiveCreateFeatureFlagSuccess, - receiveCreateFeatureFlagError, -} from '~/feature_flags/store/new/actions'; -import state from '~/feature_flags/store/new/state'; -import * as types from '~/feature_flags/store/new/mutation_types'; -import { ROLLOUT_STRATEGY_ALL_USERS, ROLLOUT_STRATEGY_PERCENT_ROLLOUT, LEGACY_FLAG, NEW_VERSION_FLAG, } from '~/feature_flags/constants'; import { mapFromScopesViewModel, mapStrategiesToRails } from '~/feature_flags/store/helpers'; +import { + createFeatureFlag, + requestCreateFeatureFlag, + receiveCreateFeatureFlagSuccess, + receiveCreateFeatureFlagError, +} from '~/feature_flags/store/new/actions'; +import * as types from '~/feature_flags/store/new/mutation_types'; +import state from '~/feature_flags/store/new/state'; import axios from '~/lib/utils/axios_utils'; jest.mock('~/lib/utils/url_utility'); diff --git a/spec/frontend/feature_flags/store/new/mutations_spec.js b/spec/frontend/feature_flags/store/new/mutations_spec.js index e8609a6d116..c97e62247bb 100644 --- a/spec/frontend/feature_flags/store/new/mutations_spec.js +++ b/spec/frontend/feature_flags/store/new/mutations_spec.js @@ -1,6 +1,6 @@ -import state from '~/feature_flags/store/new/state'; -import mutations from '~/feature_flags/store/new/mutations'; import * as types from '~/feature_flags/store/new/mutation_types'; +import mutations from '~/feature_flags/store/new/mutations'; +import state from '~/feature_flags/store/new/state'; describe('Feature flags New Module Mutations', () => { let stateCopy; |