diff options
Diffstat (limited to 'spec/frontend/ide/components')
15 files changed, 40 insertions, 44 deletions
diff --git a/spec/frontend/ide/components/branches/item_spec.js b/spec/frontend/ide/components/branches/item_spec.js index f90c298c401..271d0600e16 100644 --- a/spec/frontend/ide/components/branches/item_spec.js +++ b/spec/frontend/ide/components/branches/item_spec.js @@ -7,7 +7,7 @@ import Timeago from '~/vue_shared/components/time_ago_tooltip.vue'; import { projectData } from '../../mock_data'; const TEST_BRANCH = { - name: 'master', + name: 'main', committedDate: '2018-01-05T05:50Z', }; const TEST_PROJECT_ID = projectData.name_with_namespace; diff --git a/spec/frontend/ide/components/commit_sidebar/actions_spec.js b/spec/frontend/ide/components/commit_sidebar/actions_spec.js index c4dccf26af3..ed9d11246ae 100644 --- a/spec/frontend/ide/components/commit_sidebar/actions_spec.js +++ b/spec/frontend/ide/components/commit_sidebar/actions_spec.js @@ -10,7 +10,7 @@ import { const ACTION_UPDATE_COMMIT_ACTION = 'commit/updateCommitAction'; -const BRANCH_DEFAULT = 'master'; +const BRANCH_DEFAULT = 'main'; const BRANCH_PROTECTED = 'protected/access'; const BRANCH_PROTECTED_NO_ACCESS = 'protected/no-access'; const BRANCH_REGULAR = 'regular'; @@ -20,11 +20,7 @@ describe('IDE commit sidebar actions', () => { let store; let vm; - const createComponent = ({ - hasMR = false, - currentBranchId = 'master', - emptyRepo = false, - } = {}) => { + const createComponent = ({ hasMR = false, currentBranchId = 'main', emptyRepo = false } = {}) => { const Component = Vue.extend(commitActions); vm = createComponentWithStore(Component, store); @@ -72,7 +68,7 @@ describe('IDE commit sidebar actions', () => { it('renders current branch text', () => { createComponent(); - expect(findText()).toContain('Commit to master branch'); + expect(findText()).toContain('Commit to main branch'); }); it('hides merge request option when project merge requests are disabled', (done) => { @@ -112,7 +108,7 @@ describe('IDE commit sidebar actions', () => { it('calls again after staged changes', (done) => { createComponent({ currentBranchId: null }); - vm.$store.state.currentBranchId = 'master'; + vm.$store.state.currentBranchId = 'main'; vm.$store.state.changedFiles.push({}); vm.$store.state.stagedFiles.push({}); @@ -158,7 +154,7 @@ describe('IDE commit sidebar actions', () => { it('only renders commit to current branch', () => { expect(findRadios().length).toBe(1); - expect(findText()).toContain('Commit to master branch'); + expect(findText()).toContain('Commit to main branch'); }); }); }); diff --git a/spec/frontend/ide/components/commit_sidebar/form_spec.js b/spec/frontend/ide/components/commit_sidebar/form_spec.js index f5916b021aa..83d1bbb842e 100644 --- a/spec/frontend/ide/components/commit_sidebar/form_spec.js +++ b/spec/frontend/ide/components/commit_sidebar/form_spec.js @@ -67,7 +67,7 @@ describe('IDE commit form', () => { store = createStore(); store.state.stagedFiles.push('test'); store.state.currentProjectId = 'abcproject'; - store.state.currentBranchId = 'master'; + store.state.currentBranchId = 'main'; Vue.set(store.state.projects, 'abcproject', { ...projectData, userPermissions: { pushCode: true }, diff --git a/spec/frontend/ide/components/commit_sidebar/new_merge_request_option_spec.js b/spec/frontend/ide/components/commit_sidebar/new_merge_request_option_spec.js index 253c2a426ee..4474647552d 100644 --- a/spec/frontend/ide/components/commit_sidebar/new_merge_request_option_spec.js +++ b/spec/frontend/ide/components/commit_sidebar/new_merge_request_option_spec.js @@ -24,7 +24,7 @@ describe('create new MR checkbox', () => { store.state.projects[store.state.currentProjectId].userPermissions = permissions; }; - const createComponent = ({ currentBranchId = 'master', createNewBranch = false } = {}) => { + const createComponent = ({ currentBranchId = 'main', createNewBranch = false } = {}) => { const Component = Vue.extend(NewMergeRequestOption); vm = createComponentWithStore(Component, store); @@ -63,7 +63,7 @@ describe('create new MR checkbox', () => { describe('is rendered when pushing to a new branch', () => { beforeEach(() => { createComponent({ - currentBranchId: 'master', + currentBranchId: 'main', createNewBranch: true, }); }); @@ -87,7 +87,7 @@ describe('create new MR checkbox', () => { describe('is NOT rendered when pushing to the same branch', () => { beforeEach(() => { createComponent({ - currentBranchId: 'master', + currentBranchId: 'main', createNewBranch: false, }); }); diff --git a/spec/frontend/ide/components/ide_review_spec.js b/spec/frontend/ide/components/ide_review_spec.js index 740b7ada521..7a92f59641f 100644 --- a/spec/frontend/ide/components/ide_review_spec.js +++ b/spec/frontend/ide/components/ide_review_spec.js @@ -19,9 +19,9 @@ describe('IDE review mode', () => { beforeEach(() => { store = createStore(); store.state.currentProjectId = 'abcproject'; - store.state.currentBranchId = 'master'; + store.state.currentBranchId = 'main'; store.state.projects.abcproject = { ...projectData }; - Vue.set(store.state.trees, 'abcproject/master', { + Vue.set(store.state.trees, 'abcproject/main', { tree: [file('fileName')], loading: false, }); diff --git a/spec/frontend/ide/components/ide_spec.js b/spec/frontend/ide/components/ide_spec.js index b23a78a035d..f8d29fc7b47 100644 --- a/spec/frontend/ide/components/ide_spec.js +++ b/spec/frontend/ide/components/ide_spec.js @@ -22,9 +22,9 @@ describe('WebIDE', () => { const createComponent = ({ projData = emptyProjData, state = {} } = {}) => { store.state.currentProjectId = 'abcproject'; - store.state.currentBranchId = 'master'; + store.state.currentBranchId = 'main'; store.state.projects.abcproject = projData && { ...projData }; - store.state.trees['abcproject/master'] = { + store.state.trees['abcproject/main'] = { tree: [], loading: false, }; diff --git a/spec/frontend/ide/components/ide_status_bar_spec.js b/spec/frontend/ide/components/ide_status_bar_spec.js index 9d33a1e2554..f1a0b64caf2 100644 --- a/spec/frontend/ide/components/ide_status_bar_spec.js +++ b/spec/frontend/ide/components/ide_status_bar_spec.js @@ -24,7 +24,7 @@ describe('ideStatusBar', () => { store = createStore(); store.state.currentProjectId = TEST_PROJECT_ID; store.state.projects[TEST_PROJECT_ID] = _.clone(projectData); - store.state.currentBranchId = 'master'; + store.state.currentBranchId = 'main'; }); afterEach(() => { diff --git a/spec/frontend/ide/components/ide_tree_list_spec.js b/spec/frontend/ide/components/ide_tree_list_spec.js index c8153ea339e..85d9feb0c09 100644 --- a/spec/frontend/ide/components/ide_tree_list_spec.js +++ b/spec/frontend/ide/components/ide_tree_list_spec.js @@ -14,9 +14,9 @@ describe('IDE tree list', () => { const bootstrapWithTree = (tree = normalBranchTree) => { store.state.currentProjectId = 'abcproject'; - store.state.currentBranchId = 'master'; + store.state.currentBranchId = 'main'; store.state.projects.abcproject = { ...projectData }; - Vue.set(store.state.trees, 'abcproject/master', { + Vue.set(store.state.trees, 'abcproject/main', { tree, loading: false, }); @@ -42,7 +42,7 @@ describe('IDE tree list', () => { }); it('renders loading indicator', (done) => { - store.state.trees['abcproject/master'].loading = true; + store.state.trees['abcproject/main'].loading = true; vm.$nextTick(() => { expect(vm.$el.querySelector('.multi-file-loading-container')).not.toBeNull(); diff --git a/spec/frontend/ide/components/ide_tree_spec.js b/spec/frontend/ide/components/ide_tree_spec.js index 6eef646b012..0792b88aeb6 100644 --- a/spec/frontend/ide/components/ide_tree_spec.js +++ b/spec/frontend/ide/components/ide_tree_spec.js @@ -18,9 +18,9 @@ describe('IdeTree', () => { store = createStore(); store.state.currentProjectId = 'abcproject'; - store.state.currentBranchId = 'master'; + store.state.currentBranchId = 'main'; store.state.projects.abcproject = { ...projectData }; - Vue.set(store.state.trees, 'abcproject/master', { + Vue.set(store.state.trees, 'abcproject/main', { tree: [file('fileName')], loading: false, }); diff --git a/spec/frontend/ide/components/merge_requests/list_spec.js b/spec/frontend/ide/components/merge_requests/list_spec.js index 85acabca38b..610e20d5868 100644 --- a/spec/frontend/ide/components/merge_requests/list_spec.js +++ b/spec/frontend/ide/components/merge_requests/list_spec.js @@ -21,7 +21,7 @@ describe('IDE merge requests list', () => { const fakeStore = new Vuex.Store({ state: { currentMergeRequestId: '1', - currentProjectId: 'project/master', + currentProjectId: 'project/main', ...restOfState, }, modules: { diff --git a/spec/frontend/ide/components/nav_dropdown_spec.js b/spec/frontend/ide/components/nav_dropdown_spec.js index 4ddb3930764..6a1be7ee964 100644 --- a/spec/frontend/ide/components/nav_dropdown_spec.js +++ b/spec/frontend/ide/components/nav_dropdown_spec.js @@ -14,14 +14,14 @@ describe('IDE NavDropdown', () => { store = createStore(); Object.assign(store.state, { currentProjectId: TEST_PROJECT_ID, - currentBranchId: 'master', + currentBranchId: 'main', projects: { [TEST_PROJECT_ID]: { userPermissions: { [PERMISSION_READ_MR]: true, }, branches: { - master: { id: 'master' }, + main: { id: 'main' }, }, }, }, diff --git a/spec/frontend/ide/components/new_dropdown/index_spec.js b/spec/frontend/ide/components/new_dropdown/index_spec.js index 5a1c0471206..fa34d1b257f 100644 --- a/spec/frontend/ide/components/new_dropdown/index_spec.js +++ b/spec/frontend/ide/components/new_dropdown/index_spec.js @@ -13,7 +13,7 @@ describe('new dropdown component', () => { const component = Vue.extend(newDropdown); vm = createComponentWithStore(component, store, { - branch: 'master', + branch: 'main', path: '', mouseOver: false, type: 'tree', diff --git a/spec/frontend/ide/components/new_dropdown/modal_spec.js b/spec/frontend/ide/components/new_dropdown/modal_spec.js index 0600fcea917..fce6ccf4b58 100644 --- a/spec/frontend/ide/components/new_dropdown/modal_spec.js +++ b/spec/frontend/ide/components/new_dropdown/modal_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; import { createComponentWithStore } from 'helpers/vue_mount_component_helper'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; +import createFlash from '~/flash'; import modal from '~/ide/components/new_dropdown/modal.vue'; import { createStore } from '~/ide/stores'; @@ -182,14 +182,14 @@ describe('new file modal component', () => { vm.submitForm(); - expect(createFlash).toHaveBeenCalledWith( - 'The name "test-path/test" is already taken in this directory.', - 'alert', - expect.anything(), - null, - false, - true, - ); + expect(createFlash).toHaveBeenCalledWith({ + message: 'The name "test-path/test" is already taken in this directory.', + type: 'alert', + parent: expect.anything(), + actionConfig: null, + fadeTransition: false, + addBodyClass: true, + }); }); it('does not throw error when target entry does not exist', () => { diff --git a/spec/frontend/ide/components/repo_commit_section_spec.js b/spec/frontend/ide/components/repo_commit_section_spec.js index c174f5e2006..db4181395d3 100644 --- a/spec/frontend/ide/components/repo_commit_section_spec.js +++ b/spec/frontend/ide/components/repo_commit_section_spec.js @@ -22,11 +22,11 @@ describe('RepoCommitSection', () => { store.state.noChangesStateSvgPath = 'svg'; store.state.committedStateSvgPath = 'commitsvg'; store.state.currentProjectId = 'abcproject'; - store.state.currentBranchId = 'master'; + store.state.currentBranchId = 'main'; store.state.projects.abcproject = { web_url: '', branches: { - master: { + main: { workingReference: '1', }, }, @@ -39,7 +39,7 @@ describe('RepoCommitSection', () => { }), ); - store.state.currentBranch = 'master'; + store.state.currentBranch = 'main'; store.state.changedFiles = []; store.state.stagedFiles = [{ ...files[0] }, { ...files[1] }]; store.state.stagedFiles.forEach((f) => diff --git a/spec/frontend/ide/components/repo_editor_spec.js b/spec/frontend/ide/components/repo_editor_spec.js index 646e51160d8..8e8fb31b15a 100644 --- a/spec/frontend/ide/components/repo_editor_spec.js +++ b/spec/frontend/ide/components/repo_editor_spec.js @@ -63,8 +63,8 @@ const prepareStore = (state, activeFile) => { projects: { 'gitlab-org/gitlab': { branches: { - master: { - name: 'master', + main: { + name: 'main', commit: { id: 'abcdefgh', }, @@ -73,7 +73,7 @@ const prepareStore = (state, activeFile) => { }, }, currentProjectId: 'gitlab-org/gitlab', - currentBranchId: 'master', + currentBranchId: 'main', entries: { [activeFile.path]: activeFile, }, @@ -656,7 +656,7 @@ describe('RepoEditor', () => { }); it("does not add file to state or set markdown image syntax if the file isn't markdown", async () => { - wrapper.setProps({ + await wrapper.setProps({ file: setFileName('myfile.txt'), }); pasteImage(); |