Commit b689b20f authored by Hiroyuki Sato's avatar Hiroyuki Sato

Fix typos occured to occurred

parent f3c44f64
...@@ -84,7 +84,7 @@ export default class AjaxVariableList { ...@@ -84,7 +84,7 @@ export default class AjaxVariableList {
.catch(() => { .catch(() => {
loadingIcon.classList.toggle('hide', true); loadingIcon.classList.toggle('hide', true);
this.variableList.toggleEnableRow(true); this.variableList.toggleEnableRow(true);
Flash(s__('CiVariable|Error occured while saving variables')); Flash(s__('CiVariable|Error occurred while saving variables'));
}); });
} }
......
...@@ -79,7 +79,7 @@ export const getFileData = ({ state, commit, dispatch }, { path, makeFileActive ...@@ -79,7 +79,7 @@ export const getFileData = ({ state, commit, dispatch }, { path, makeFileActive
.catch(() => { .catch(() => {
commit(types.TOGGLE_LOADING, { entry: file }); commit(types.TOGGLE_LOADING, { entry: file });
dispatch('setErrorMessage', { dispatch('setErrorMessage', {
text: __('An error occured whilst loading the file.'), text: __('An error occurred whilst loading the file.'),
action: payload => action: payload =>
dispatch('getFileData', payload).then(() => dispatch('setErrorMessage', null)), dispatch('getFileData', payload).then(() => dispatch('setErrorMessage', null)),
actionText: __('Please try again'), actionText: __('Please try again'),
...@@ -121,7 +121,7 @@ export const getRawFileData = ({ state, commit, dispatch, getters }, { path }) = ...@@ -121,7 +121,7 @@ export const getRawFileData = ({ state, commit, dispatch, getters }, { path }) =
}) })
.catch(() => { .catch(() => {
dispatch('setErrorMessage', { dispatch('setErrorMessage', {
text: __('An error occured whilst loading the file content.'), text: __('An error occurred whilst loading the file content.'),
action: payload => action: payload =>
dispatch('getRawFileData', payload).then(() => dispatch('setErrorMessage', null)), dispatch('getRawFileData', payload).then(() => dispatch('setErrorMessage', null)),
actionText: __('Please try again'), actionText: __('Please try again'),
......
...@@ -25,7 +25,7 @@ export const getMergeRequestData = ( ...@@ -25,7 +25,7 @@ export const getMergeRequestData = (
}) })
.catch(() => { .catch(() => {
dispatch('setErrorMessage', { dispatch('setErrorMessage', {
text: __('An error occured whilst loading the merge request.'), text: __('An error occurred whilst loading the merge request.'),
action: payload => action: payload =>
dispatch('getMergeRequestData', payload).then(() => dispatch('getMergeRequestData', payload).then(() =>
dispatch('setErrorMessage', null), dispatch('setErrorMessage', null),
...@@ -58,7 +58,7 @@ export const getMergeRequestChanges = ( ...@@ -58,7 +58,7 @@ export const getMergeRequestChanges = (
}) })
.catch(() => { .catch(() => {
dispatch('setErrorMessage', { dispatch('setErrorMessage', {
text: __('An error occured whilst loading the merge request changes.'), text: __('An error occurred whilst loading the merge request changes.'),
action: payload => action: payload =>
dispatch('getMergeRequestChanges', payload).then(() => dispatch('getMergeRequestChanges', payload).then(() =>
dispatch('setErrorMessage', null), dispatch('setErrorMessage', null),
...@@ -92,7 +92,7 @@ export const getMergeRequestVersions = ( ...@@ -92,7 +92,7 @@ export const getMergeRequestVersions = (
}) })
.catch(() => { .catch(() => {
dispatch('setErrorMessage', { dispatch('setErrorMessage', {
text: __('An error occured whilst loading the merge request version data.'), text: __('An error occurred whilst loading the merge request version data.'),
action: payload => action: payload =>
dispatch('getMergeRequestVersions', payload).then(() => dispatch('getMergeRequestVersions', payload).then(() =>
dispatch('setErrorMessage', null), dispatch('setErrorMessage', null),
......
...@@ -103,7 +103,7 @@ export const createNewBranchFromDefault = ({ state, dispatch, getters }, branch) ...@@ -103,7 +103,7 @@ export const createNewBranchFromDefault = ({ state, dispatch, getters }, branch)
}) })
.catch(() => { .catch(() => {
dispatch('setErrorMessage', { dispatch('setErrorMessage', {
text: __('An error occured creating the new branch.'), text: __('An error occurred creating the new branch.'),
action: payload => dispatch('createNewBranchFromDefault', payload), action: payload => dispatch('createNewBranchFromDefault', payload),
actionText: __('Please try again'), actionText: __('Please try again'),
actionPayload: branch, actionPayload: branch,
......
...@@ -76,7 +76,7 @@ export const getFiles = ({ state, commit, dispatch }, { projectId, branchId } = ...@@ -76,7 +76,7 @@ export const getFiles = ({ state, commit, dispatch }, { projectId, branchId } =
dispatch('showBranchNotFoundError', branchId); dispatch('showBranchNotFoundError', branchId);
} else { } else {
dispatch('setErrorMessage', { dispatch('setErrorMessage', {
text: __('An error occured whilst loading all the files.'), text: __('An error occurred whilst loading all the files.'),
action: payload => action: payload =>
dispatch('getFiles', payload).then(() => dispatch('setErrorMessage', null)), dispatch('getFiles', payload).then(() => dispatch('setErrorMessage', null)),
actionText: __('Please try again'), actionText: __('Please try again'),
......
...@@ -28,7 +28,7 @@ export const receiveLatestPipelineError = ({ commit, dispatch }, err) => { ...@@ -28,7 +28,7 @@ export const receiveLatestPipelineError = ({ commit, dispatch }, err) => {
dispatch( dispatch(
'setErrorMessage', 'setErrorMessage',
{ {
text: __('An error occured whilst fetching the latest pipline.'), text: __('An error occurred whilst fetching the latest pipline.'),
action: () => action: () =>
dispatch('forcePipelineRequest').then(() => dispatch('forcePipelineRequest').then(() =>
dispatch('setErrorMessage', null, { root: true }), dispatch('setErrorMessage', null, { root: true }),
...@@ -84,7 +84,7 @@ export const receiveJobsError = ({ commit, dispatch }, stage) => { ...@@ -84,7 +84,7 @@ export const receiveJobsError = ({ commit, dispatch }, stage) => {
dispatch( dispatch(
'setErrorMessage', 'setErrorMessage',
{ {
text: __('An error occured whilst loading the pipelines jobs.'), text: __('An error occurred whilst loading the pipelines jobs.'),
action: payload => action: payload =>
dispatch('fetchJobs', payload).then(() => dispatch('fetchJobs', payload).then(() =>
dispatch('setErrorMessage', null, { root: true }), dispatch('setErrorMessage', null, { root: true }),
...@@ -123,7 +123,7 @@ export const receiveJobTraceError = ({ commit, dispatch }) => { ...@@ -123,7 +123,7 @@ export const receiveJobTraceError = ({ commit, dispatch }) => {
dispatch( dispatch(
'setErrorMessage', 'setErrorMessage',
{ {
text: __('An error occured whilst fetching the job trace.'), text: __('An error occurred whilst fetching the job trace.'),
action: () => action: () =>
dispatch('fetchJobTrace').then(() => dispatch('setErrorMessage', null, { root: true })), dispatch('fetchJobTrace').then(() => dispatch('setErrorMessage', null, { root: true })),
actionText: __('Please try again'), actionText: __('Please try again'),
......
...@@ -47,7 +47,7 @@ export default { ...@@ -47,7 +47,7 @@ export default {
errorMessage() { errorMessage() {
return sprintf( return sprintf(
s__( s__(
'ClusterIntegration|An error occured while trying to fetch zone machine types: %{error}', 'ClusterIntegration|An error occurred while trying to fetch zone machine types: %{error}',
), ),
{ error: this.gapiError }, { error: this.gapiError },
); );
......
...@@ -93,7 +93,7 @@ export default { ...@@ -93,7 +93,7 @@ export default {
} }
return sprintf( return sprintf(
s__('ClusterIntegration|An error occured while trying to fetch your projects: %{error}'), s__('ClusterIntegration|An error occurred while trying to fetch your projects: %{error}'),
{ error: this.gapiError }, { error: this.gapiError },
); );
}, },
......
...@@ -111,6 +111,6 @@ Promise.all(matchedFiles.map(checkFileWithPrettierConfig)) ...@@ -111,6 +111,6 @@ Promise.all(matchedFiles.map(checkFileWithPrettierConfig))
if (didWarn) process.exit(1); if (didWarn) process.exit(1);
}) })
.catch(e => { .catch(e => {
console.log(`\nAn error occured while processing files with prettier: ${e.message}\n`); console.log(`\nAn error occurred while processing files with prettier: ${e.message}\n`);
process.exit(1); process.exit(1);
}); });
...@@ -55,11 +55,11 @@ describe 'User creates branch and merge request on issue page', :js do ...@@ -55,11 +55,11 @@ describe 'User creates branch and merge request on issue page', :js do
test_branch_name_checking(input_branch_name) test_branch_name_checking(input_branch_name)
test_source_checking(input_source) test_source_checking(input_source)
# The button inside dropdown should be disabled if any errors occured. # The button inside dropdown should be disabled if any errors occurred.
expect(page).to have_button('Create branch', disabled: true) expect(page).to have_button('Create branch', disabled: true)
end end
# The top level button should be disabled if any errors occured. # The top level button should be disabled if any errors occurred.
expect(page).to have_button('Create branch', disabled: true) expect(page).to have_button('Create branch', disabled: true)
end end
......
...@@ -296,7 +296,7 @@ describe('IDE store file actions', () => { ...@@ -296,7 +296,7 @@ describe('IDE store file actions', () => {
.getFileData({ state: store.state, commit() {}, dispatch }, { path: localFile.path }) .getFileData({ state: store.state, commit() {}, dispatch }, { path: localFile.path })
.then(() => { .then(() => {
expect(dispatch).toHaveBeenCalledWith('setErrorMessage', { expect(dispatch).toHaveBeenCalledWith('setErrorMessage', {
text: 'An error occured whilst loading the file.', text: 'An error occurred whilst loading the file.',
action: jasmine.any(Function), action: jasmine.any(Function),
actionText: 'Please try again', actionText: 'Please try again',
actionPayload: { actionPayload: {
...@@ -408,7 +408,7 @@ describe('IDE store file actions', () => { ...@@ -408,7 +408,7 @@ describe('IDE store file actions', () => {
.then(done.fail) .then(done.fail)
.catch(() => { .catch(() => {
expect(dispatch).toHaveBeenCalledWith('setErrorMessage', { 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), action: jasmine.any(Function),
actionText: 'Please try again', actionText: 'Please try again',
actionPayload: { actionPayload: {
......
...@@ -82,7 +82,7 @@ describe('IDE store merge request actions', () => { ...@@ -82,7 +82,7 @@ describe('IDE store merge request actions', () => {
.then(done.fail) .then(done.fail)
.catch(() => { .catch(() => {
expect(dispatch).toHaveBeenCalledWith('setErrorMessage', { 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), action: jasmine.any(Function),
actionText: 'Please try again', actionText: 'Please try again',
actionPayload: { actionPayload: {
...@@ -155,7 +155,7 @@ describe('IDE store merge request actions', () => { ...@@ -155,7 +155,7 @@ describe('IDE store merge request actions', () => {
.then(done.fail) .then(done.fail)
.catch(() => { .catch(() => {
expect(dispatch).toHaveBeenCalledWith('setErrorMessage', { 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), action: jasmine.any(Function),
actionText: 'Please try again', actionText: 'Please try again',
actionPayload: { actionPayload: {
...@@ -225,7 +225,7 @@ describe('IDE store merge request actions', () => { ...@@ -225,7 +225,7 @@ describe('IDE store merge request actions', () => {
.then(done.fail) .then(done.fail)
.catch(() => { .catch(() => {
expect(dispatch).toHaveBeenCalledWith('setErrorMessage', { 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), action: jasmine.any(Function),
actionText: 'Please try again', actionText: 'Please try again',
actionPayload: { actionPayload: {
......
...@@ -143,7 +143,7 @@ describe('Multi-file store tree actions', () => { ...@@ -143,7 +143,7 @@ describe('Multi-file store tree actions', () => {
.then(done.fail) .then(done.fail)
.catch(() => { .catch(() => {
expect(dispatch).toHaveBeenCalledWith('setErrorMessage', { 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), action: jasmine.any(Function),
actionText: 'Please try again', actionText: 'Please try again',
actionPayload: { projectId: 'abc/def', branchId: 'master-testing' }, actionPayload: { projectId: 'abc/def', branchId: 'master-testing' },
......
...@@ -77,7 +77,7 @@ describe('IDE pipelines actions', () => { ...@@ -77,7 +77,7 @@ describe('IDE pipelines actions', () => {
{ {
type: 'setErrorMessage', type: 'setErrorMessage',
payload: { payload: {
text: 'An error occured whilst fetching the latest pipline.', text: 'An error occurred whilst fetching the latest pipline.',
action: jasmine.any(Function), action: jasmine.any(Function),
actionText: 'Please try again', actionText: 'Please try again',
actionPayload: null, actionPayload: null,
...@@ -223,7 +223,7 @@ describe('IDE pipelines actions', () => { ...@@ -223,7 +223,7 @@ describe('IDE pipelines actions', () => {
{ {
type: 'setErrorMessage', type: 'setErrorMessage',
payload: { payload: {
text: 'An error occured whilst loading the pipelines jobs.', text: 'An error occurred whilst loading the pipelines jobs.',
action: jasmine.anything(), action: jasmine.anything(),
actionText: 'Please try again', actionText: 'Please try again',
actionPayload: { id: 1 }, actionPayload: { id: 1 },
...@@ -360,7 +360,7 @@ describe('IDE pipelines actions', () => { ...@@ -360,7 +360,7 @@ describe('IDE pipelines actions', () => {
{ {
type: 'setErrorMessage', type: 'setErrorMessage',
payload: { payload: {
text: 'An error occured whilst fetching the job trace.', text: 'An error occurred whilst fetching the job trace.',
action: jasmine.any(Function), action: jasmine.any(Function),
actionText: 'Please try again', actionText: 'Please try again',
actionPayload: null, actionPayload: null,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment