Commit 9983ee55 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'fix-misspellings-app' into 'master'

Fix misspellings in app/spec executable lines

See merge request gitlab-org/gitlab-ce!25521
parents db29496f a565f3d8
...@@ -34,7 +34,7 @@ export default { ...@@ -34,7 +34,7 @@ export default {
}, },
errorMessage() { errorMessage() {
return sprintf( return sprintf(
s__('ClusterIntegration|An error occured while trying to fetch project zones: %{error}'), s__('ClusterIntegration|An error occurred while trying to fetch project zones: %{error}'),
{ error: this.gapiError }, { error: this.gapiError },
); );
}, },
......
...@@ -30,7 +30,7 @@ export const receiveReleasesSuccess = ({ commit }, data) => ...@@ -30,7 +30,7 @@ export const receiveReleasesSuccess = ({ commit }, data) =>
export const receiveReleasesError = ({ commit }) => { export const receiveReleasesError = ({ commit }) => {
commit(types.RECEIVE_RELEASES_ERROR); commit(types.RECEIVE_RELEASES_ERROR);
createFlash(__('An error occured while fetching the releases. Please try again.')); createFlash(__('An error occurred while fetching the releases. Please try again.'));
}; };
// prevent babel-plugin-rewire from generating an invalid default during karma tests // prevent babel-plugin-rewire from generating an invalid default during karma tests
......
...@@ -115,7 +115,7 @@ module Ci ...@@ -115,7 +115,7 @@ module Ci
current_data = get_data current_data = get_data
unless current_data&.bytesize.to_i == CHUNK_SIZE unless current_data&.bytesize.to_i == CHUNK_SIZE
raise FailedToPersistDataError, 'Data is not fullfilled in a bucket' raise FailedToPersistDataError, 'Data is not fulfilled in a bucket'
end end
old_store_class = self.class.get_store_class(data_store) old_store_class = self.class.get_store_class(data_store)
......
...@@ -45,7 +45,7 @@ module Commits ...@@ -45,7 +45,7 @@ module Commits
def validate! def validate!
validate_permissions! validate_permissions!
validate_on_branch! validate_on_branch!
validate_branch_existance! validate_branch_existence!
validate_new_branch_name! if different_branch? validate_new_branch_name! if different_branch?
end end
...@@ -64,7 +64,7 @@ module Commits ...@@ -64,7 +64,7 @@ module Commits
end end
end end
def validate_branch_existance! def validate_branch_existence!
if !project.empty_repo? && different_branch? && repository.branch_exists?(@branch_name) if !project.empty_repo? && different_branch? && repository.branch_exists?(@branch_name)
raise_error("A branch called '#{@branch_name}' already exists. Switch to that branch in order to make changes") raise_error("A branch called '#{@branch_name}' already exists. Switch to that branch in order to make changes")
end end
......
...@@ -612,9 +612,6 @@ msgstr "" ...@@ -612,9 +612,6 @@ msgstr ""
msgid "An error has occurred" msgid "An error has occurred"
msgstr "" msgstr ""
msgid "An error occured while fetching the releases. Please try again."
msgstr ""
msgid "An error occurred creating the new branch." msgid "An error occurred creating the new branch."
msgstr "" msgstr ""
...@@ -654,6 +651,9 @@ msgstr "" ...@@ -654,6 +651,9 @@ msgstr ""
msgid "An error occurred while fetching the pipeline." msgid "An error occurred while fetching the pipeline."
msgstr "" msgstr ""
msgid "An error occurred while fetching the releases. Please try again."
msgstr ""
msgid "An error occurred while getting projects" msgid "An error occurred while getting projects"
msgstr "" msgstr ""
...@@ -1605,10 +1605,10 @@ msgstr "" ...@@ -1605,10 +1605,10 @@ msgstr ""
msgid "ClusterIntegration|Alternatively" msgid "ClusterIntegration|Alternatively"
msgstr "" msgstr ""
msgid "ClusterIntegration|An error occured while trying to fetch project zones: %{error}" msgid "ClusterIntegration|An error occurred when trying to contact the Google Cloud API. Please try again later."
msgstr "" msgstr ""
msgid "ClusterIntegration|An error occurred when trying to contact the Google Cloud API. Please try again later." msgid "ClusterIntegration|An error occurred while trying to fetch project zones: %{error}"
msgstr "" msgstr ""
msgid "ClusterIntegration|An error occurred while trying to fetch your projects: %{error}" msgid "ClusterIntegration|An error occurred while trying to fetch your projects: %{error}"
......
...@@ -178,7 +178,7 @@ describe 'Merge request > User posts diff notes', :js do ...@@ -178,7 +178,7 @@ describe 'Merge request > User posts diff notes', :js do
end end
end end
describe 'with muliple note forms' do describe 'with multiple note forms' do
before do before do
visit diffs_project_merge_request_path(project, merge_request, view: 'inline') visit diffs_project_merge_request_path(project, merge_request, view: 'inline')
click_diff_line(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_10_9"]')) click_diff_line(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_10_9"]'))
......
...@@ -1795,7 +1795,7 @@ GroupsController ...@@ -1795,7 +1795,7 @@ GroupsController
when requesting a redirected path when requesting a redirected path
returns not found returns not found
PUT transfer PUT transfer
when transfering to a subgroup goes right when transferring to a subgroup goes right
should return a notice (PENDING: around hook at ./spec/spec_helper.rb:190 did not execute the example) should return a notice (PENDING: around hook at ./spec/spec_helper.rb:190 did not execute the example)
should redirect to the new path (PENDING: around hook at ./spec/spec_helper.rb:190 did not execute the example) should redirect to the new path (PENDING: around hook at ./spec/spec_helper.rb:190 did not execute the example)
when converting to a root group goes right when converting to a root group goes right
...@@ -2299,7 +2299,7 @@ Groups::TransferService ...@@ -2299,7 +2299,7 @@ Groups::TransferService
should update subgroups path (PENDING: around hook at ./spec/spec_helper.rb:190 did not execute the example) should update subgroups path (PENDING: around hook at ./spec/spec_helper.rb:190 did not execute the example)
should update projects path (PENDING: around hook at ./spec/spec_helper.rb:190 did not execute the example) should update projects path (PENDING: around hook at ./spec/spec_helper.rb:190 did not execute the example)
should create redirect for the subgroups and projects (PENDING: around hook at ./spec/spec_helper.rb:190 did not execute the example) should create redirect for the subgroups and projects (PENDING: around hook at ./spec/spec_helper.rb:190 did not execute the example)
when transfering a group with nested groups and projects when transferring a group with nested groups and projects
should update subgroups path (PENDING: around hook at ./spec/spec_helper.rb:190 did not execute the example) should update subgroups path (PENDING: around hook at ./spec/spec_helper.rb:190 did not execute the example)
should update projects path (PENDING: around hook at ./spec/spec_helper.rb:190 did not execute the example) should update projects path (PENDING: around hook at ./spec/spec_helper.rb:190 did not execute the example)
should create redirect for the subgroups and projects (PENDING: around hook at ./spec/spec_helper.rb:190 did not execute the example) should create redirect for the subgroups and projects (PENDING: around hook at ./spec/spec_helper.rb:190 did not execute the example)
...@@ -2426,9 +2426,9 @@ Groups::MilestonesController ...@@ -2426,9 +2426,9 @@ Groups::MilestonesController
lists legacy group milestones and group milestones lists legacy group milestones and group milestones
#show #show
when there is a title parameter when there is a title parameter
searchs for a legacy group milestone searches for a legacy group milestone
when there is not a title parameter when there is not a title parameter
searchs for a group milestone searches for a group milestone
behaves like milestone tabs behaves like milestone tabs
#merge_requests #merge_requests
as html as html
...@@ -3109,11 +3109,11 @@ Pending: (Failures listed here are expected and do not affect your suite's statu ...@@ -3109,11 +3109,11 @@ Pending: (Failures listed here are expected and do not affect your suite's statu
# around hook at ./spec/spec_helper.rb:186 did not execute the example # around hook at ./spec/spec_helper.rb:186 did not execute the example
# ./spec/controllers/groups_controller_spec.rb:129 # ./spec/controllers/groups_controller_spec.rb:129
15) GroupsController PUT transfer when transfering to a subgroup goes right should return a notice 15) GroupsController PUT transfer when transferring to a subgroup goes right should return a notice
# around hook at ./spec/spec_helper.rb:190 did not execute the example # around hook at ./spec/spec_helper.rb:190 did not execute the example
# ./spec/controllers/groups_controller_spec.rb:516 # ./spec/controllers/groups_controller_spec.rb:516
16) GroupsController PUT transfer when transfering to a subgroup goes right should redirect to the new path 16) GroupsController PUT transfer when transferring to a subgroup goes right should redirect to the new path
# around hook at ./spec/spec_helper.rb:190 did not execute the example # around hook at ./spec/spec_helper.rb:190 did not execute the example
# ./spec/controllers/groups_controller_spec.rb:520 # ./spec/controllers/groups_controller_spec.rb:520
...@@ -3301,15 +3301,15 @@ Pending: (Failures listed here are expected and do not affect your suite's statu ...@@ -3301,15 +3301,15 @@ Pending: (Failures listed here are expected and do not affect your suite's statu
# around hook at ./spec/spec_helper.rb:190 did not execute the example # around hook at ./spec/spec_helper.rb:190 did not execute the example
# ./spec/services/groups/transfer_service_spec.rb:341 # ./spec/services/groups/transfer_service_spec.rb:341
63) Groups::TransferService#execute when transferring a subgroup into another group when transfering a group with nested groups and projects should update subgroups path 63) Groups::TransferService#execute when transferring a subgroup into another group when transferring a group with nested groups and projects should update subgroups path
# around hook at ./spec/spec_helper.rb:190 did not execute the example # around hook at ./spec/spec_helper.rb:190 did not execute the example
# ./spec/services/groups/transfer_service_spec.rb:363 # ./spec/services/groups/transfer_service_spec.rb:363
64) Groups::TransferService#execute when transferring a subgroup into another group when transfering a group with nested groups and projects should update projects path 64) Groups::TransferService#execute when transferring a subgroup into another group when transferring a group with nested groups and projects should update projects path
# around hook at ./spec/spec_helper.rb:190 did not execute the example # around hook at ./spec/spec_helper.rb:190 did not execute the example
# ./spec/services/groups/transfer_service_spec.rb:375 # ./spec/services/groups/transfer_service_spec.rb:375
65) Groups::TransferService#execute when transferring a subgroup into another group when transfering a group with nested groups and projects should create redirect for the subgroups and projects 65) Groups::TransferService#execute when transferring a subgroup into another group when transferring a group with nested groups and projects should create redirect for the subgroups and projects
# around hook at ./spec/spec_helper.rb:190 did not execute the example # around hook at ./spec/spec_helper.rb:190 did not execute the example
# ./spec/services/groups/transfer_service_spec.rb:383 # ./spec/services/groups/transfer_service_spec.rb:383
......
...@@ -411,7 +411,7 @@ describe('Badges store actions', () => { ...@@ -411,7 +411,7 @@ describe('Badges store actions', () => {
it('escapes user input', done => { it('escapes user input', done => {
spyOn(axios, 'get').and.callFake(() => Promise.resolve({ data: createDummyBadgeResponse() })); spyOn(axios, 'get').and.callFake(() => Promise.resolve({ data: createDummyBadgeResponse() }));
badgeInForm.imageUrl = '&make-sandwhich=true'; badgeInForm.imageUrl = '&make-sandwich=true';
badgeInForm.linkUrl = '<script>I am dangerous!</script>'; badgeInForm.linkUrl = '<script>I am dangerous!</script>';
actions actions
...@@ -422,7 +422,7 @@ describe('Badges store actions', () => { ...@@ -422,7 +422,7 @@ describe('Badges store actions', () => {
expect(url).toMatch(`^${dummyEndpointUrl}/render?`); expect(url).toMatch(`^${dummyEndpointUrl}/render?`);
expect(url).toMatch('\\?link_url=%3Cscript%3EI%20am%20dangerous!%3C%2Fscript%3E&'); expect(url).toMatch('\\?link_url=%3Cscript%3EI%20am%20dangerous!%3C%2Fscript%3E&');
expect(url).toMatch('&image_url=%26make-sandwhich%3Dtrue$'); expect(url).toMatch('&image_url=%26make-sandwich%3Dtrue$');
}) })
.then(done) .then(done)
.catch(done.fail); .catch(done.fail);
......
...@@ -530,7 +530,7 @@ describe('Notes Store mutations', () => { ...@@ -530,7 +530,7 @@ describe('Notes Store mutations', () => {
state = { convertedDisscussionIds: [] }; state = { convertedDisscussionIds: [] };
}); });
it('adds a disucssion to convertedDisscussionIds', () => { it('adds a discussion to convertedDisscussionIds', () => {
mutations.CONVERT_TO_DISCUSSION(state, discussion.id); mutations.CONVERT_TO_DISCUSSION(state, discussion.id);
expect(state.convertedDisscussionIds).toContain(discussion.id); expect(state.convertedDisscussionIds).toContain(discussion.id);
...@@ -549,7 +549,7 @@ describe('Notes Store mutations', () => { ...@@ -549,7 +549,7 @@ describe('Notes Store mutations', () => {
state = { convertedDisscussionIds: [41, 42] }; state = { convertedDisscussionIds: [41, 42] };
}); });
it('removes a disucssion from convertedDisscussionIds', () => { it('removes a discussion from convertedDisscussionIds', () => {
mutations.REMOVE_CONVERTED_DISCUSSION(state, discussion.id); mutations.REMOVE_CONVERTED_DISCUSSION(state, discussion.id);
expect(state.convertedDisscussionIds).not.toContain(discussion.id); expect(state.convertedDisscussionIds).not.toContain(discussion.id);
......
...@@ -143,7 +143,7 @@ describe Gitlab::CurrentSettings do ...@@ -143,7 +143,7 @@ describe Gitlab::CurrentSettings do
it_behaves_like 'a non-persisted ApplicationSetting object' it_behaves_like 'a non-persisted ApplicationSetting object'
it 'uses the value from the DB attribute if present and not overriden by an accessor' do it 'uses the value from the DB attribute if present and not overridden by an accessor' do
expect(current_settings.home_page_url).to eq(db_settings.home_page_url) expect(current_settings.home_page_url).to eq(db_settings.home_page_url)
end end
end end
......
...@@ -19,7 +19,7 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameBase, :delete ...@@ -19,7 +19,7 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameBase, :delete
Project.find(project.id) Project.find(project.id)
end end
describe "#remove_last_ocurrence" do describe "#remove_last_occurrence" do
it "removes only the last occurrence of a string" do it "removes only the last occurrence of a string" do
input = "this/is/a-word-to-replace/namespace/with/a-word-to-replace" input = "this/is/a-word-to-replace/namespace/with/a-word-to-replace"
......
...@@ -15,7 +15,7 @@ describe Gitlab::Prometheus::Queries::MatchedMetricQuery do ...@@ -15,7 +15,7 @@ describe Gitlab::Prometheus::Queries::MatchedMetricQuery do
[{ '__name__' => 'metric_a' }, [{ '__name__' => 'metric_a' },
{ '__name__' => 'metric_b' }] { '__name__' => 'metric_b' }]
end end
let(:partialy_empty_series_info) { [{ '__name__' => 'metric_a', 'environment' => '' }] } let(:partially_empty_series_info) { [{ '__name__' => 'metric_a', 'environment' => '' }] }
let(:empty_series_info) { [] } let(:empty_series_info) { [] }
let(:client) { double('prometheus_client') } let(:client) { double('prometheus_client') }
...@@ -60,7 +60,7 @@ describe Gitlab::Prometheus::Queries::MatchedMetricQuery do ...@@ -60,7 +60,7 @@ describe Gitlab::Prometheus::Queries::MatchedMetricQuery do
context 'one of the series info was not found' do context 'one of the series info was not found' do
before do before do
allow(client).to receive(:series).and_return(partialy_empty_series_info) allow(client).to receive(:series).and_return(partially_empty_series_info)
end end
it 'responds with one active and one missing metric' do it 'responds with one active and one missing metric' do
expect(subject.query).to eq([{ group: 'name', priority: 1, active_metrics: 1, metrics_missing_requirements: 1 }]) expect(subject.query).to eq([{ group: 'name', priority: 1, active_metrics: 1, metrics_missing_requirements: 1 }])
......
...@@ -121,7 +121,7 @@ describe ObjectStorage::DirectUpload do ...@@ -121,7 +121,7 @@ describe ObjectStorage::DirectUpload do
expect(subject[:MultipartUpload][:PartURLs].length).to eq(2) expect(subject[:MultipartUpload][:PartURLs].length).to eq(2)
end end
it 'part size is mimimum, 5MB' do it 'part size is minimum, 5MB' do
expect(subject[:MultipartUpload][:PartSize]).to eq(5.megabyte) expect(subject[:MultipartUpload][:PartSize]).to eq(5.megabyte)
end end
end end
......
...@@ -171,7 +171,7 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do ...@@ -171,7 +171,7 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do
end end
shared_examples_for 'Scheduling sidekiq worker to flush data to persist store' do shared_examples_for 'Scheduling sidekiq worker to flush data to persist store' do
context 'when new data fullfilled chunk size' do context 'when new data fulfilled chunk size' do
let(:new_data) { 'a' * described_class::CHUNK_SIZE } let(:new_data) { 'a' * described_class::CHUNK_SIZE }
it 'schedules trace chunk flush worker' do it 'schedules trace chunk flush worker' do
...@@ -193,7 +193,7 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do ...@@ -193,7 +193,7 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do
end end
shared_examples_for 'Scheduling no sidekiq worker' do shared_examples_for 'Scheduling no sidekiq worker' do
context 'when new data fullfilled chunk size' do context 'when new data fulfilled chunk size' do
let(:new_data) { 'a' * described_class::CHUNK_SIZE } let(:new_data) { 'a' * described_class::CHUNK_SIZE }
it 'does not schedule trace chunk flush worker' do it 'does not schedule trace chunk flush worker' do
......
...@@ -99,7 +99,7 @@ describe Sortable do ...@@ -99,7 +99,7 @@ describe Sortable do
expect(ordered_group_names('id_desc')).to eq(%w(bbb BB AAA aa)) expect(ordered_group_names('id_desc')).to eq(%w(bbb BB AAA aa))
end end
it 'sorts groups by name via case-insentitive comparision' do it 'sorts groups by name via case-insensitive comparision' do
expect(ordered_group_names('name_asc')).to eq(%w(aa AAA BB bbb)) expect(ordered_group_names('name_asc')).to eq(%w(aa AAA BB bbb))
expect(ordered_group_names('name_desc')).to eq(%w(bbb BB AAA aa)) expect(ordered_group_names('name_desc')).to eq(%w(bbb BB AAA aa))
end end
......
...@@ -13,7 +13,7 @@ describe ProviderRepoEntity do ...@@ -13,7 +13,7 @@ describe ProviderRepoEntity do
describe '#as_json' do describe '#as_json' do
subject { entity.as_json } subject { entity.as_json }
it 'includes requried fields' do it 'includes required fields' do
expect(subject[:id]).to eq(provider_repo[:id]) expect(subject[:id]).to eq(provider_repo[:id])
expect(subject[:full_name]).to eq(provider_repo[:full_name]) expect(subject[:full_name]).to eq(provider_repo[:full_name])
expect(subject[:owner_name]).to eq(provider_repo[:owner][:login]) expect(subject[:owner_name]).to eq(provider_repo[:owner][:login])
......
...@@ -177,7 +177,7 @@ describe NotificationService, :mailer do ...@@ -177,7 +177,7 @@ describe NotificationService, :mailer do
end end
end end
context 'when recieving a non-existent method' do context 'when receiving a non-existent method' do
it 'raises NoMethodError' do it 'raises NoMethodError' do
expect { async.foo(key) }.to raise_error(NoMethodError) expect { async.foo(key) }.to raise_error(NoMethodError)
end end
......
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