diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-31 12:07:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-31 12:07:36 +0300 |
commit | b7a422e845aff188077292f3833e3105dae23062 (patch) | |
tree | b7bc96071c3c6823edf92718f4b0b3dda950dc03 /spec/tasks | |
parent | 3a5eccd3d0601c058aeecc74959305e70084f2be (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/tasks')
-rw-r--r-- | spec/tasks/gitlab/background_migrations_rake_spec.rb | 2 | ||||
-rw-r--r-- | spec/tasks/gitlab/db/decomposition/connection_status_rake_spec.rb | 2 | ||||
-rw-r--r-- | spec/tasks/gitlab/db_rake_spec.rb | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/spec/tasks/gitlab/background_migrations_rake_spec.rb b/spec/tasks/gitlab/background_migrations_rake_spec.rb index 04be713e0d4..0a7ab214cc1 100644 --- a/spec/tasks/gitlab/background_migrations_rake_spec.rb +++ b/spec/tasks/gitlab/background_migrations_rake_spec.rb @@ -18,7 +18,7 @@ RSpec.describe 'gitlab:background_migrations namespace rake tasks', :suppress_gi before do allow(Gitlab::Database).to receive(:database_base_models).and_return(base_models) - allow(Gitlab::Database).to receive(:db_config_names).and_return(databases) + allow(Gitlab::Database).to receive(:db_config_names).with(with_schema: :gitlab_shared).and_return(databases) end context 'without the proper arguments' do diff --git a/spec/tasks/gitlab/db/decomposition/connection_status_rake_spec.rb b/spec/tasks/gitlab/db/decomposition/connection_status_rake_spec.rb index 78f86049ebb..4c161faf733 100644 --- a/spec/tasks/gitlab/db/decomposition/connection_status_rake_spec.rb +++ b/spec/tasks/gitlab/db/decomposition/connection_status_rake_spec.rb @@ -49,7 +49,7 @@ RSpec.describe 'gitlab:db:decomposition:connection_status', feature_category: :c context 'when separate ci database is configured' do before do - skip_if_multiple_databases_not_setup + skip_if_multiple_databases_not_setup(:ci) end it "does not show connection information" do diff --git a/spec/tasks/gitlab/db_rake_spec.rb b/spec/tasks/gitlab/db_rake_spec.rb index 95730f62b28..bc2fd0b22eb 100644 --- a/spec/tasks/gitlab/db_rake_spec.rb +++ b/spec/tasks/gitlab/db_rake_spec.rb @@ -563,8 +563,8 @@ RSpec.describe 'gitlab:db namespace rake task', :silence_stdout, feature_categor end if Gitlab.ee? - allow(File).to receive(:open).with(Rails.root.join(Gitlab::Database::EMBEDDING_DATABASE_DIR, 'structure.sql').to_s, any_args).and_yield(output) - allow(File).to receive(:open).with(Rails.root.join(Gitlab::Database::GEO_DATABASE_DIR, 'structure.sql').to_s, any_args).and_yield(output) + allow(File).to receive(:open).with(Rails.root.join('ee/db/geo/structure.sql').to_s, any_args).and_yield(output) + allow(File).to receive(:open).with(Rails.root.join('ee/db/embedding/structure.sql').to_s, any_args).and_yield(output) end end @@ -1018,7 +1018,7 @@ RSpec.describe 'gitlab:db namespace rake task', :silence_stdout, feature_categor end where(:db) do - Gitlab::Database::DATABASE_NAMES.map(&:to_sym) + ::Gitlab::Database.db_config_names(with_schema: :gitlab_shared).map(&:to_sym) end with_them do |