diff options
author | Kushal Pandya <kushalspandya@gmail.com> | 2018-11-22 17:02:52 +0300 |
---|---|---|
committer | Kushal Pandya <kushalspandya@gmail.com> | 2018-11-22 17:02:52 +0300 |
commit | 7002752d47da4957f4aed1f4210c491178f9cde9 (patch) | |
tree | d2f787ea2a23ce64478e09720659af4f893c5ac1 /spec/javascripts/ide | |
parent | 85cc480fa8bcd61f477911e3b0aeeb9f153b301c (diff) | |
parent | e49cc4efe2ace609c4ed8aac0e55a0ed7f9ad480 (diff) |
Merge branch 'fix-typos-occured' into 'master'
Fix typos occured to occurred
See merge request gitlab-org/gitlab-ce!23105
Diffstat (limited to 'spec/javascripts/ide')
4 files changed, 9 insertions, 9 deletions
diff --git a/spec/javascripts/ide/stores/actions/file_spec.js b/spec/javascripts/ide/stores/actions/file_spec.js index 1ca811e996b..7ddc734ff56 100644 --- a/spec/javascripts/ide/stores/actions/file_spec.js +++ b/spec/javascripts/ide/stores/actions/file_spec.js @@ -296,7 +296,7 @@ describe('IDE store file actions', () => { .getFileData({ state: store.state, commit() {}, dispatch }, { path: localFile.path }) .then(() => { expect(dispatch).toHaveBeenCalledWith('setErrorMessage', { - text: 'An error occured whilst loading the file.', + text: 'An error occurred whilst loading the file.', action: jasmine.any(Function), actionText: 'Please try again', actionPayload: { @@ -408,7 +408,7 @@ describe('IDE store file actions', () => { .then(done.fail) .catch(() => { expect(dispatch).toHaveBeenCalledWith('setErrorMessage', { - text: 'An error occured whilst loading the file content.', + text: 'An error occurred whilst loading the file content.', action: jasmine.any(Function), actionText: 'Please try again', actionPayload: { diff --git a/spec/javascripts/ide/stores/actions/merge_request_spec.js b/spec/javascripts/ide/stores/actions/merge_request_spec.js index d8e9260e932..9bfc7c397b8 100644 --- a/spec/javascripts/ide/stores/actions/merge_request_spec.js +++ b/spec/javascripts/ide/stores/actions/merge_request_spec.js @@ -82,7 +82,7 @@ describe('IDE store merge request actions', () => { .then(done.fail) .catch(() => { expect(dispatch).toHaveBeenCalledWith('setErrorMessage', { - text: 'An error occured whilst loading the merge request.', + text: 'An error occurred whilst loading the merge request.', action: jasmine.any(Function), actionText: 'Please try again', actionPayload: { @@ -155,7 +155,7 @@ describe('IDE store merge request actions', () => { .then(done.fail) .catch(() => { expect(dispatch).toHaveBeenCalledWith('setErrorMessage', { - text: 'An error occured whilst loading the merge request changes.', + text: 'An error occurred whilst loading the merge request changes.', action: jasmine.any(Function), actionText: 'Please try again', actionPayload: { @@ -225,7 +225,7 @@ describe('IDE store merge request actions', () => { .then(done.fail) .catch(() => { expect(dispatch).toHaveBeenCalledWith('setErrorMessage', { - text: 'An error occured whilst loading the merge request version data.', + text: 'An error occurred whilst loading the merge request version data.', action: jasmine.any(Function), actionText: 'Please try again', actionPayload: { diff --git a/spec/javascripts/ide/stores/actions/tree_spec.js b/spec/javascripts/ide/stores/actions/tree_spec.js index d47c60dc581..bd41e87bf0e 100644 --- a/spec/javascripts/ide/stores/actions/tree_spec.js +++ b/spec/javascripts/ide/stores/actions/tree_spec.js @@ -143,7 +143,7 @@ describe('Multi-file store tree actions', () => { .then(done.fail) .catch(() => { expect(dispatch).toHaveBeenCalledWith('setErrorMessage', { - text: 'An error occured whilst loading all the files.', + text: 'An error occurred whilst loading all the files.', action: jasmine.any(Function), actionText: 'Please try again', actionPayload: { projectId: 'abc/def', branchId: 'master-testing' }, diff --git a/spec/javascripts/ide/stores/modules/pipelines/actions_spec.js b/spec/javascripts/ide/stores/modules/pipelines/actions_spec.js index c9c09ee9afe..0937ee38390 100644 --- a/spec/javascripts/ide/stores/modules/pipelines/actions_spec.js +++ b/spec/javascripts/ide/stores/modules/pipelines/actions_spec.js @@ -77,7 +77,7 @@ describe('IDE pipelines actions', () => { { type: 'setErrorMessage', payload: { - text: 'An error occured whilst fetching the latest pipeline.', + text: 'An error occurred whilst fetching the latest pipeline.', action: jasmine.any(Function), actionText: 'Please try again', actionPayload: null, @@ -223,7 +223,7 @@ describe('IDE pipelines actions', () => { { type: 'setErrorMessage', payload: { - text: 'An error occured whilst loading the pipelines jobs.', + text: 'An error occurred whilst loading the pipelines jobs.', action: jasmine.anything(), actionText: 'Please try again', actionPayload: { id: 1 }, @@ -360,7 +360,7 @@ describe('IDE pipelines actions', () => { { type: 'setErrorMessage', payload: { - text: 'An error occured whilst fetching the job trace.', + text: 'An error occurred whilst fetching the job trace.', action: jasmine.any(Function), actionText: 'Please try again', actionPayload: null, |