diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 15:08:49 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 15:08:49 +0300 |
commit | 1308dc5eb484ab0f8064989fc551ebdb4b1a7976 (patch) | |
tree | 614a93d9bf8df34ecfc25c02648329987fb21dde /spec/javascripts | |
parent | f0707f413ce49b5712fca236b950acbec029be1e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/javascripts')
5 files changed, 20 insertions, 93 deletions
diff --git a/spec/javascripts/flash_spec.js b/spec/javascripts/flash_spec.js index 28fa87ac097..39ca4eedb69 100644 --- a/spec/javascripts/flash_spec.js +++ b/spec/javascripts/flash_spec.js @@ -40,7 +40,7 @@ describe('Flash', () => { expect(el.style['transition-property']).toBe('opacity'); - expect(el.style['transition-duration']).toBe('0.3s'); + expect(el.style['transition-duration']).toBe('0.15s'); }); it('sets opacity style', () => { diff --git a/spec/javascripts/ide/components/commit_sidebar/form_spec.js b/spec/javascripts/ide/components/commit_sidebar/form_spec.js index e984389bd46..9ee0cbdd3d4 100644 --- a/spec/javascripts/ide/components/commit_sidebar/form_spec.js +++ b/spec/javascripts/ide/components/commit_sidebar/form_spec.js @@ -52,7 +52,7 @@ describe('IDE commit form', () => { vm.$store.state.stagedFiles.push('test'); vm.$nextTick(() => { - expect(vm.$el.querySelector('p').textContent).toContain('1 unstaged and 1 staged changes'); + expect(vm.$el.querySelector('p').textContent).toContain('1 staged and 1 unstaged changes'); done(); }); }); diff --git a/spec/javascripts/ide/components/file_row_extra_spec.js b/spec/javascripts/ide/components/file_row_extra_spec.js index 4c2f29f55dd..f498d8251c8 100644 --- a/spec/javascripts/ide/components/file_row_extra_spec.js +++ b/spec/javascripts/ide/components/file_row_extra_spec.js @@ -63,7 +63,7 @@ describe('IDE extra file row component', () => { stagedFilesCount = 1; unstagedFilesCount = 1; - expect(vm.folderChangesTooltip).toBe('1 unstaged and 1 staged changes'); + expect(vm.folderChangesTooltip).toBe('1 staged and 1 unstaged changes'); }); }); diff --git a/spec/javascripts/ide/stores/actions_spec.js b/spec/javascripts/ide/stores/actions_spec.js index 4e65a7b0673..364c8421b6b 100644 --- a/spec/javascripts/ide/stores/actions_spec.js +++ b/spec/javascripts/ide/stores/actions_spec.js @@ -225,35 +225,6 @@ describe('Multi-file store actions', () => { .catch(done.fail); }); - describe('when `gon.feature.stageAllByDefault` is true', () => { - const originalGonFeatures = Object.assign({}, gon.features); - - beforeAll(() => { - gon.features = { stageAllByDefault: true }; - }); - - afterAll(() => { - gon.features = originalGonFeatures; - }); - - it('adds tmp file to staged files', done => { - const name = 'test'; - - store - .dispatch('createTempEntry', { - name, - branchId: 'mybranch', - type: 'blob', - }) - .then(() => { - expect(store.state.stagedFiles).toEqual([jasmine.objectContaining({ name })]); - - done(); - }) - .catch(done.fail); - }); - }); - it('adds tmp file to open files', done => { const name = 'test'; @@ -274,7 +245,7 @@ describe('Multi-file store actions', () => { .catch(done.fail); }); - it('adds tmp file to changed files', done => { + it('adds tmp file to staged files', done => { const name = 'test'; store @@ -284,9 +255,7 @@ describe('Multi-file store actions', () => { type: 'blob', }) .then(() => { - expect(store.state.changedFiles).toEqual([ - jasmine.objectContaining({ name, tempFile: true }), - ]); + expect(store.state.stagedFiles).toEqual([jasmine.objectContaining({ name })]); done(); }) @@ -294,15 +263,9 @@ describe('Multi-file store actions', () => { }); it('sets tmp file as active', () => { - const dispatch = jasmine.createSpy(); - const commit = jasmine.createSpy(); - - createTempEntry( - { state: store.state, getters: store.getters, dispatch, commit }, - { name: 'test', branchId: 'mybranch', type: 'blob' }, - ); + createTempEntry(store, { name: 'test', branchId: 'mybranch', type: 'blob' }); - expect(dispatch).toHaveBeenCalledWith('setFileActive', 'test'); + expect(store.dispatch).toHaveBeenCalledWith('setFileActive', 'test'); }); it('creates flash message if file already exists', done => { @@ -804,55 +767,19 @@ describe('Multi-file store actions', () => { }); }); - describe('when `gon.feature.stageAllByDefault` is true', () => { - const originalGonFeatures = Object.assign({}, gon.features); - - beforeAll(() => { - gon.features = { stageAllByDefault: true }; - }); - - afterAll(() => { - gon.features = originalGonFeatures; - }); - - it('by default renames an entry and stages it', () => { - const dispatch = jasmine.createSpy(); - const commit = jasmine.createSpy(); - - renameEntry( - { dispatch, commit, state: store.state, getters: store.getters }, - { path: 'orig', name: 'renamed' }, - ); - - expect(commit.calls.allArgs()).toEqual([ - [types.RENAME_ENTRY, { path: 'orig', name: 'renamed', parentPath: undefined }], - [types.STAGE_CHANGE, jasmine.objectContaining({ path: 'renamed' })], - ]); - }); - }); + it('by default renames an entry and stages it', () => { + const dispatch = jasmine.createSpy(); + const commit = jasmine.createSpy(); - it('by default renames an entry and adds to changed', done => { - testAction( - renameEntry, + renameEntry( + { dispatch, commit, state: store.state, getters: store.getters }, { path: 'orig', name: 'renamed' }, - store.state, - [ - { - type: types.RENAME_ENTRY, - payload: { - path: 'orig', - name: 'renamed', - parentPath: undefined, - }, - }, - { - type: types.ADD_FILE_TO_CHANGED, - payload: 'renamed', - }, - ], - jasmine.any(Object), - done, ); + + expect(commit.calls.allArgs()).toEqual([ + [types.RENAME_ENTRY, { path: 'orig', name: 'renamed', parentPath: undefined }], + [types.STAGE_CHANGE, jasmine.objectContaining({ path: 'renamed' })], + ]); }); it('if not changed, completely unstages and discards entry if renamed to original', done => { diff --git a/spec/javascripts/vue_shared/components/project_selector/project_selector_spec.js b/spec/javascripts/vue_shared/components/project_selector/project_selector_spec.js index 2b60ea0fd74..178df54b465 100644 --- a/spec/javascripts/vue_shared/components/project_selector/project_selector_spec.js +++ b/spec/javascripts/vue_shared/components/project_selector/project_selector_spec.js @@ -1,5 +1,5 @@ import Vue from 'vue'; -import _ from 'underscore'; +import { head } from 'lodash'; import { GlSearchBoxByType, GlInfiniteScroll } from '@gitlab/ui'; import { mount, createLocalVue } from '@vue/test-utils'; @@ -99,9 +99,9 @@ describe('ProjectSelector component', () => { it(`triggers a "projectClicked" event when a project is clicked`, () => { spyOn(vm, '$emit'); - wrapper.find(ProjectListItem).vm.$emit('click', _.first(searchResults)); + wrapper.find(ProjectListItem).vm.$emit('click', head(searchResults)); - expect(vm.$emit).toHaveBeenCalledWith('projectClicked', _.first(searchResults)); + expect(vm.$emit).toHaveBeenCalledWith('projectClicked', head(searchResults)); }); it(`shows a "no results" message if showNoResultsMessage === true`, () => { |