Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-11-03 06:13:15 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-11-03 06:13:15 +0300
commit6f0447dba04ade76f8ea5fba59bbb48625afb9b6 (patch)
treee0fc195c1d510370d5ef3e90d31e0ef109f3b7b0 /spec/support_specs/database
parent511c2bbab1ffd3832b734d7d8ee513fddf6edcb4 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support_specs/database')
-rw-r--r--spec/support_specs/database/multiple_databases_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/support_specs/database/multiple_databases_spec.rb b/spec/support_specs/database/multiple_databases_spec.rb
index 6ad15fd6594..10d1a8277c6 100644
--- a/spec/support_specs/database/multiple_databases_spec.rb
+++ b/spec/support_specs/database/multiple_databases_spec.rb
@@ -19,19 +19,19 @@ RSpec.describe 'Database::MultipleDatabases' do
end
end
- context 'on Ci::CiDatabaseRecord' do
+ context 'on Ci::ApplicationRecord' do
before do
skip_if_multiple_databases_not_setup
end
it 'raises exception' do
- expect { Ci::CiDatabaseRecord.establish_connection(:ci) }.to raise_error /Cannot re-establish/
+ expect { Ci::ApplicationRecord.establish_connection(:ci) }.to raise_error /Cannot re-establish/
end
context 'when using with_reestablished_active_record_base' do
it 'does not raise exception' do
with_reestablished_active_record_base do
- expect { Ci::CiDatabaseRecord.establish_connection(:main) }.not_to raise_error
+ expect { Ci::ApplicationRecord.establish_connection(:main) }.not_to raise_error
end
end
end