From a565f3d88d9c2e38b615378298b8db1f306ebd53 Mon Sep 17 00:00:00 2001 From: Takuya Noguchi Date: Mon, 25 Feb 2019 17:19:36 +0900 Subject: Fix misspellings in app/spec executable lines Signed-off-by: Takuya Noguchi --- .../components/gke_zone_dropdown.vue | 2 +- app/assets/javascripts/releases/store/actions.js | 2 +- app/models/ci/build_trace_chunk.rb | 2 +- app/services/commits/create_service.rb | 4 ++-- locale/gitlab.pot | 10 +++++----- .../merge_request/user_posts_diff_notes_spec.rb | 2 +- spec/fixtures/trace/sample_trace | 18 +++++++++--------- spec/javascripts/badges/store/actions_spec.js | 4 ++-- spec/javascripts/notes/stores/mutation_spec.js | 4 ++-- spec/lib/gitlab/current_settings_spec.rb | 2 +- .../v1/rename_base_spec.rb | 2 +- .../prometheus/queries/matched_metric_query_spec.rb | 4 ++-- spec/lib/object_storage/direct_upload_spec.rb | 2 +- spec/models/ci/build_trace_chunk_spec.rb | 4 ++-- spec/models/concerns/sortable_spec.rb | 2 +- spec/serializers/provider_repo_entity_spec.rb | 2 +- spec/services/notification_service_spec.rb | 2 +- 17 files changed, 34 insertions(+), 34 deletions(-) diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue index 5f8a4946f4a..fd5d5f86401 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue @@ -34,7 +34,7 @@ export default { }, errorMessage() { 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 }, ); }, diff --git a/app/assets/javascripts/releases/store/actions.js b/app/assets/javascripts/releases/store/actions.js index b5c4d54ac33..e0a922d5ef6 100644 --- a/app/assets/javascripts/releases/store/actions.js +++ b/app/assets/javascripts/releases/store/actions.js @@ -30,7 +30,7 @@ export const receiveReleasesSuccess = ({ commit }, data) => export const receiveReleasesError = ({ commit }) => { 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 diff --git a/app/models/ci/build_trace_chunk.rb b/app/models/ci/build_trace_chunk.rb index 33e61cd2111..75017f224a0 100644 --- a/app/models/ci/build_trace_chunk.rb +++ b/app/models/ci/build_trace_chunk.rb @@ -115,7 +115,7 @@ module Ci current_data = get_data 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 old_store_class = self.class.get_store_class(data_store) diff --git a/app/services/commits/create_service.rb b/app/services/commits/create_service.rb index 34593e12bd5..a3b87c20761 100644 --- a/app/services/commits/create_service.rb +++ b/app/services/commits/create_service.rb @@ -45,7 +45,7 @@ module Commits def validate! validate_permissions! validate_on_branch! - validate_branch_existance! + validate_branch_existence! validate_new_branch_name! if different_branch? end @@ -64,7 +64,7 @@ module Commits end end - def validate_branch_existance! + def validate_branch_existence! 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") end diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 188065864c7..588dd766bdc 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -612,9 +612,6 @@ msgstr "" msgid "An error has occurred" msgstr "" -msgid "An error occured while fetching the releases. Please try again." -msgstr "" - msgid "An error occurred creating the new branch." msgstr "" @@ -654,6 +651,9 @@ msgstr "" msgid "An error occurred while fetching the pipeline." msgstr "" +msgid "An error occurred while fetching the releases. Please try again." +msgstr "" + msgid "An error occurred while getting projects" msgstr "" @@ -1605,10 +1605,10 @@ msgstr "" msgid "ClusterIntegration|Alternatively" 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 "" -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 "" msgid "ClusterIntegration|An error occurred while trying to fetch your projects: %{error}" diff --git a/spec/features/merge_request/user_posts_diff_notes_spec.rb b/spec/features/merge_request/user_posts_diff_notes_spec.rb index 51b78d3e7d1..19edce1b562 100644 --- a/spec/features/merge_request/user_posts_diff_notes_spec.rb +++ b/spec/features/merge_request/user_posts_diff_notes_spec.rb @@ -178,7 +178,7 @@ describe 'Merge request > User posts diff notes', :js do end end - describe 'with muliple note forms' do + describe 'with multiple note forms' do before do visit diffs_project_merge_request_path(project, merge_request, view: 'inline') click_diff_line(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_10_9"]')) diff --git a/spec/fixtures/trace/sample_trace b/spec/fixtures/trace/sample_trace index 3d8beb0dec2..8f9747f8143 100644 --- a/spec/fixtures/trace/sample_trace +++ b/spec/fixtures/trace/sample_trace @@ -1795,7 +1795,7 @@ GroupsController when requesting a redirected path returns not found 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 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 @@ -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 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) - 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 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) @@ -2426,9 +2426,9 @@ Groups::MilestonesController lists legacy group milestones and group milestones #show 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 - searchs for a group milestone + searches for a group milestone behaves like milestone tabs #merge_requests as html @@ -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 # ./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 # ./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 # ./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 # around hook at ./spec/spec_helper.rb:190 did not execute the example # ./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 # ./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 # ./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 # ./spec/services/groups/transfer_service_spec.rb:383 diff --git a/spec/javascripts/badges/store/actions_spec.js b/spec/javascripts/badges/store/actions_spec.js index 2623465ebd6..e8d5f8c3aac 100644 --- a/spec/javascripts/badges/store/actions_spec.js +++ b/spec/javascripts/badges/store/actions_spec.js @@ -411,7 +411,7 @@ describe('Badges store actions', () => { it('escapes user input', done => { spyOn(axios, 'get').and.callFake(() => Promise.resolve({ data: createDummyBadgeResponse() })); - badgeInForm.imageUrl = '&make-sandwhich=true'; + badgeInForm.imageUrl = '&make-sandwich=true'; badgeInForm.linkUrl = ''; actions @@ -422,7 +422,7 @@ describe('Badges store actions', () => { expect(url).toMatch(`^${dummyEndpointUrl}/render?`); 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) .catch(done.fail); diff --git a/spec/javascripts/notes/stores/mutation_spec.js b/spec/javascripts/notes/stores/mutation_spec.js index fcad1f245b6..aa08bf59a7f 100644 --- a/spec/javascripts/notes/stores/mutation_spec.js +++ b/spec/javascripts/notes/stores/mutation_spec.js @@ -530,7 +530,7 @@ describe('Notes Store mutations', () => { state = { convertedDisscussionIds: [] }; }); - it('adds a disucssion to convertedDisscussionIds', () => { + it('adds a discussion to convertedDisscussionIds', () => { mutations.CONVERT_TO_DISCUSSION(state, discussion.id); expect(state.convertedDisscussionIds).toContain(discussion.id); @@ -549,7 +549,7 @@ describe('Notes Store mutations', () => { state = { convertedDisscussionIds: [41, 42] }; }); - it('removes a disucssion from convertedDisscussionIds', () => { + it('removes a discussion from convertedDisscussionIds', () => { mutations.REMOVE_CONVERTED_DISCUSSION(state, discussion.id); expect(state.convertedDisscussionIds).not.toContain(discussion.id); diff --git a/spec/lib/gitlab/current_settings_spec.rb b/spec/lib/gitlab/current_settings_spec.rb index caf9fc5442c..17d5eae24f5 100644 --- a/spec/lib/gitlab/current_settings_spec.rb +++ b/spec/lib/gitlab/current_settings_spec.rb @@ -143,7 +143,7 @@ describe Gitlab::CurrentSettings do 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) end end diff --git a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base_spec.rb b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base_spec.rb index 248cca25a2c..81419e51635 100644 --- a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base_spec.rb +++ b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base_spec.rb @@ -19,7 +19,7 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameBase, :delete Project.find(project.id) end - describe "#remove_last_ocurrence" do + describe "#remove_last_occurrence" do it "removes only the last occurrence of a string" do input = "this/is/a-word-to-replace/namespace/with/a-word-to-replace" diff --git a/spec/lib/gitlab/prometheus/queries/matched_metric_query_spec.rb b/spec/lib/gitlab/prometheus/queries/matched_metric_query_spec.rb index 420218a695a..936447b8474 100644 --- a/spec/lib/gitlab/prometheus/queries/matched_metric_query_spec.rb +++ b/spec/lib/gitlab/prometheus/queries/matched_metric_query_spec.rb @@ -15,7 +15,7 @@ describe Gitlab::Prometheus::Queries::MatchedMetricQuery do [{ '__name__' => 'metric_a' }, { '__name__' => 'metric_b' }] end - let(:partialy_empty_series_info) { [{ '__name__' => 'metric_a', 'environment' => '' }] } + let(:partially_empty_series_info) { [{ '__name__' => 'metric_a', 'environment' => '' }] } let(:empty_series_info) { [] } let(:client) { double('prometheus_client') } @@ -60,7 +60,7 @@ describe Gitlab::Prometheus::Queries::MatchedMetricQuery do context 'one of the series info was not found' 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 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 }]) diff --git a/spec/lib/object_storage/direct_upload_spec.rb b/spec/lib/object_storage/direct_upload_spec.rb index 1024e1a25ea..8ccbd90ddb8 100644 --- a/spec/lib/object_storage/direct_upload_spec.rb +++ b/spec/lib/object_storage/direct_upload_spec.rb @@ -121,7 +121,7 @@ describe ObjectStorage::DirectUpload do expect(subject[:MultipartUpload][:PartURLs].length).to eq(2) end - it 'part size is mimimum, 5MB' do + it 'part size is minimum, 5MB' do expect(subject[:MultipartUpload][:PartSize]).to eq(5.megabyte) end end diff --git a/spec/models/ci/build_trace_chunk_spec.rb b/spec/models/ci/build_trace_chunk_spec.rb index d214fdf369a..59db347582b 100644 --- a/spec/models/ci/build_trace_chunk_spec.rb +++ b/spec/models/ci/build_trace_chunk_spec.rb @@ -171,7 +171,7 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do end 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 } it 'schedules trace chunk flush worker' do @@ -193,7 +193,7 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do end 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 } it 'does not schedule trace chunk flush worker' do diff --git a/spec/models/concerns/sortable_spec.rb b/spec/models/concerns/sortable_spec.rb index 39c16ae60af..0a9d2021a19 100644 --- a/spec/models/concerns/sortable_spec.rb +++ b/spec/models/concerns/sortable_spec.rb @@ -99,7 +99,7 @@ describe Sortable do expect(ordered_group_names('id_desc')).to eq(%w(bbb BB AAA aa)) 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_desc')).to eq(%w(bbb BB AAA aa)) end diff --git a/spec/serializers/provider_repo_entity_spec.rb b/spec/serializers/provider_repo_entity_spec.rb index b67115bab10..9a1160d16d5 100644 --- a/spec/serializers/provider_repo_entity_spec.rb +++ b/spec/serializers/provider_repo_entity_spec.rb @@ -13,7 +13,7 @@ describe ProviderRepoEntity do describe '#as_json' do subject { entity.as_json } - it 'includes requried fields' do + it 'includes required fields' do expect(subject[:id]).to eq(provider_repo[:id]) expect(subject[:full_name]).to eq(provider_repo[:full_name]) expect(subject[:owner_name]).to eq(provider_repo[:owner][:login]) diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb index 6a5a6989607..9ba4a11104a 100644 --- a/spec/services/notification_service_spec.rb +++ b/spec/services/notification_service_spec.rb @@ -177,7 +177,7 @@ describe NotificationService, :mailer do end end - context 'when recieving a non-existent method' do + context 'when receiving a non-existent method' do it 'raises NoMethodError' do expect { async.foo(key) }.to raise_error(NoMethodError) end -- cgit v1.2.3