diff options
| -rw-r--r-- | .rubocop.yml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/gitlab-schema-spec.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/update-large-table-spec.yml | 5 | ||||
| -rw-r--r-- | spec/graphql/gitlab_schema_spec.rb | 4 | ||||
| -rw-r--r-- | spec/rubocop/cop/migration/update_large_table_spec.rb | 6 |
5 files changed, 15 insertions, 7 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 830503a1497..fb6933d1883 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -393,10 +393,8 @@ RSpec/RepeatedExample: - 'spec/features/projects/files/template_type_dropdown_spec.rb' - 'spec/finders/environments_finder_spec.rb' - 'spec/frontend/fixtures/merge_requests.rb' - - 'spec/graphql/gitlab_schema_spec.rb' - 'spec/helpers/users_helper_spec.rb' - 'spec/lib/gitlab/closing_issue_extractor_spec.rb' - 'spec/lib/gitlab/import_export/project/relation_factory_spec.rb' - - 'spec/rubocop/cop/migration/update_large_table_spec.rb' - 'spec/services/notification_service_spec.rb' - 'spec/services/web_hook_service_spec.rb' diff --git a/changelogs/unreleased/gitlab-schema-spec.yml b/changelogs/unreleased/gitlab-schema-spec.yml new file mode 100644 index 00000000000..d02191d4c93 --- /dev/null +++ b/changelogs/unreleased/gitlab-schema-spec.yml @@ -0,0 +1,5 @@ +--- +title: Add missing spec for gitlab schema +merge_request: 28855 +author: Rajendra Kadam +type: added diff --git a/changelogs/unreleased/update-large-table-spec.yml b/changelogs/unreleased/update-large-table-spec.yml new file mode 100644 index 00000000000..013d222ecc0 --- /dev/null +++ b/changelogs/unreleased/update-large-table-spec.yml @@ -0,0 +1,5 @@ +--- +title: Update duplicate specs in update large table spec +merge_request: 28787 +author: Rajendra Kadam +type: added diff --git a/spec/graphql/gitlab_schema_spec.rb b/spec/graphql/gitlab_schema_spec.rb index f8b56b6002a..50b210cdbca 100644 --- a/spec/graphql/gitlab_schema_spec.rb +++ b/spec/graphql/gitlab_schema_spec.rb @@ -10,8 +10,8 @@ describe GitlabSchema do expect(field_instrumenters).to include(BatchLoader::GraphQL) end - it 'enables the preload instrumenter' do - expect(field_instrumenters).to include(BatchLoader::GraphQL) + it 'enables the generic instrumenter' do + expect(field_instrumenters).to include(instance_of(::Gitlab::Graphql::GenericTracing)) end it 'enables the authorization instrumenter' do diff --git a/spec/rubocop/cop/migration/update_large_table_spec.rb b/spec/rubocop/cop/migration/update_large_table_spec.rb index bdb0ca3466b..30cd84108df 100644 --- a/spec/rubocop/cop/migration/update_large_table_spec.rb +++ b/spec/rubocop/cop/migration/update_large_table_spec.rb @@ -76,14 +76,14 @@ describe RuboCop::Cop::Migration::UpdateLargeTable do expect(cop.offenses).to be_empty end - it 'registers no offense for update_column_in_batches' do + it 'registers no offense for rename_column_concurrently' do inspect_source("rename_column_concurrently :#{table}, :column, default: true") expect(cop.offenses).to be_empty end - it 'registers no offense for update_column_in_batches' do - inspect_source("add_column_with_default :#{table}, :column, default: true") + it 'registers no offense for update_column_concurrently' do + inspect_source("update_column_concurrently :#{table}, :column, default: true") expect(cop.offenses).to be_empty end |