diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-19 18:10:53 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-19 18:10:53 +0300 |
commit | 8f3a9dbb94b5a9ae4570a22bbc2a75e7572407c8 (patch) | |
tree | 0d7e5d6d5747b57a93df1181bd86a7a127c16934 /spec/services/click_house/sync_strategies | |
parent | 7344cec8c24f1599086498ba19096cf9918ee168 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/click_house/sync_strategies')
-rw-r--r-- | spec/services/click_house/sync_strategies/base_sync_strategy_spec.rb | 4 | ||||
-rw-r--r-- | spec/services/click_house/sync_strategies/event_sync_strategy_spec.rb | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/spec/services/click_house/sync_strategies/base_sync_strategy_spec.rb b/spec/services/click_house/sync_strategies/base_sync_strategy_spec.rb index eb9324fd24b..af1785a7eb7 100644 --- a/spec/services/click_house/sync_strategies/base_sync_strategy_spec.rb +++ b/spec/services/click_house/sync_strategies/base_sync_strategy_spec.rb @@ -128,7 +128,7 @@ RSpec.describe ClickHouse::SyncStrategies::BaseSyncStrategy, feature_category: : context 'when clickhouse is not configured' do before do - allow(ClickHouse::Client.configuration).to receive(:databases).and_return({}) + allow(Gitlab::ClickHouse).to receive(:configured?).and_return(false) end it 'skips execution' do @@ -138,7 +138,7 @@ RSpec.describe ClickHouse::SyncStrategies::BaseSyncStrategy, feature_category: : context 'when exclusive lease error happens' do it 'skips execution' do - allow(ClickHouse::Client.configuration).to receive(:databases).and_return({ main: :some_db }) + allow(Gitlab::ClickHouse).to receive(:configured?).and_return(true) expect(strategy).to receive(:in_lock).and_raise(Gitlab::ExclusiveLeaseHelpers::FailedToObtainLockError) expect(execute).to eq({ status: :skipped }) diff --git a/spec/services/click_house/sync_strategies/event_sync_strategy_spec.rb b/spec/services/click_house/sync_strategies/event_sync_strategy_spec.rb index 05fcf6ddeb3..80f5b7b30f7 100644 --- a/spec/services/click_house/sync_strategies/event_sync_strategy_spec.rb +++ b/spec/services/click_house/sync_strategies/event_sync_strategy_spec.rb @@ -95,7 +95,7 @@ RSpec.describe ClickHouse::SyncStrategies::EventSyncStrategy, feature_category: describe '#enabled?' do context 'when the clickhouse database is configured the feature flag is enabled' do before do - allow(ClickHouse::Client.configuration).to receive(:databases).and_return({ main: :some_db }) + allow(Gitlab::ClickHouse).to receive(:configured?).and_return(true) stub_feature_flags(event_sync_worker_for_click_house: true) end @@ -106,7 +106,7 @@ RSpec.describe ClickHouse::SyncStrategies::EventSyncStrategy, feature_category: context 'when the clickhouse database is not configured' do before do - allow(ClickHouse::Client.configuration).to receive(:databases).and_return({}) + allow(Gitlab::ClickHouse).to receive(:configured?).and_return(false) end it 'returns false' do @@ -116,7 +116,7 @@ RSpec.describe ClickHouse::SyncStrategies::EventSyncStrategy, feature_category: context 'when the feature flag is disabled' do before do - allow(ClickHouse::Client.configuration).to receive(:databases).and_return({ main: :some_db }) + allow(Gitlab::ClickHouse).to receive(:configured?).and_return(true) stub_feature_flags(event_sync_worker_for_click_house: false) end |