diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-05 00:09:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-05 00:09:33 +0300 |
commit | 961ecc4cc2cc02e14ca577da55f1be174934e879 (patch) | |
tree | f3576d0b276fa8d73ed750186072006f4bd0c204 /spec | |
parent | f095209fd6f7ee1053c77024808ff3f5fb378b71 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec')
-rw-r--r-- | spec/graphql/gitlab_schema_spec.rb | 4 | ||||
-rw-r--r-- | spec/rubocop/cop/migration/update_large_table_spec.rb | 6 |
2 files changed, 5 insertions, 5 deletions
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 |