diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-23 15:09:05 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-23 15:09:05 +0300 |
commit | ab8eecd62cc11a31568b25304f5fd31c8b7f437f (patch) | |
tree | b73b765c3cea414112840fd8041c62f886d8ce53 /spec/workers | |
parent | 00a889ea7a115ebbda95a071dd630f93b79261e3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/workers')
-rw-r--r-- | spec/workers/analytics/usage_trends/counter_job_worker_spec.rb | 2 | ||||
-rw-r--r-- | spec/workers/users/create_statistics_worker_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/workers/analytics/usage_trends/counter_job_worker_spec.rb b/spec/workers/analytics/usage_trends/counter_job_worker_spec.rb index 9e4c82ee981..dd180229d12 100644 --- a/spec/workers/analytics/usage_trends/counter_job_worker_spec.rb +++ b/spec/workers/analytics/usage_trends/counter_job_worker_spec.rb @@ -11,7 +11,7 @@ RSpec.describe Analytics::UsageTrends::CounterJobWorker do let(:job_args) { [users_measurement_identifier, user_1.id, user_2.id, recorded_at] } before do - allow(ActiveRecord::Base.connection).to receive(:transaction_open?).and_return(false) + allow(::Analytics::UsageTrends::Measurement.connection).to receive(:transaction_open?).and_return(false) end include_examples 'an idempotent worker' do diff --git a/spec/workers/users/create_statistics_worker_spec.rb b/spec/workers/users/create_statistics_worker_spec.rb index e3f082313a0..2118cc42f3a 100644 --- a/spec/workers/users/create_statistics_worker_spec.rb +++ b/spec/workers/users/create_statistics_worker_spec.rb @@ -7,7 +7,7 @@ RSpec.describe Users::CreateStatisticsWorker do subject { described_class.new.perform } before do - allow(ActiveRecord::Base.connection).to receive(:transaction_open?).and_return(false) + allow(UsersStatistics.connection).to receive(:transaction_open?).and_return(false) end context 'when successful' do |