diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-28 06:07:31 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-28 06:07:31 +0300 |
commit | b1c5e886f37f8123584a8d7a04d7cd32349b6094 (patch) | |
tree | 9a3f06f8500d13ac3b3f2f545d0c34cb2f5493f1 /spec | |
parent | 63895155f203b6af2df0689474059c1c7dfcfac8 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec')
4 files changed, 4 insertions, 11 deletions
diff --git a/spec/lib/gitlab/auth/ip_rate_limiter_spec.rb b/spec/lib/gitlab/auth/ip_rate_limiter_spec.rb index c5703cf5c24..3d9be4c3489 100644 --- a/spec/lib/gitlab/auth/ip_rate_limiter_spec.rb +++ b/spec/lib/gitlab/auth/ip_rate_limiter_spec.rb @@ -19,7 +19,7 @@ RSpec.describe Gitlab::Auth::IpRateLimiter, :use_clean_rails_memory_store_cachin before do stub_rack_attack_setting(options) - Gitlab::Redis::RateLimiting.with(&:flushdb) + Rack::Attack.reset! Rack::Attack.clear_configuration Gitlab::RackAttack.configure(Rack::Attack) end diff --git a/spec/lib/gitlab/redis/cluster_rate_limiting_spec.rb b/spec/lib/gitlab/redis/cluster_rate_limiting_spec.rb deleted file mode 100644 index 3eba3233f08..00000000000 --- a/spec/lib/gitlab/redis/cluster_rate_limiting_spec.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -RSpec.describe Gitlab::Redis::ClusterRateLimiting, feature_category: :redis do - include_examples "redis_new_instance_shared_examples", 'cluster_rate_limiting', Gitlab::Redis::Cache -end diff --git a/spec/lib/gitlab/redis/multi_store_spec.rb b/spec/lib/gitlab/redis/multi_store_spec.rb index 4c23f621b0f..74b38cfa464 100644 --- a/spec/lib/gitlab/redis/multi_store_spec.rb +++ b/spec/lib/gitlab/redis/multi_store_spec.rb @@ -1195,7 +1195,7 @@ RSpec.describe Gitlab::Redis::MultiStore, feature_category: :redis do context 'when FF table guard raises' do before do - allow(Feature::FlipperFeature).to receive(:table_exists?).and_raise(ActiveRecord::NoDatabaseError) + allow(Feature::FlipperFeature).to receive(:table_exists?).and_raise end it 'multi store is disabled' do @@ -1221,7 +1221,7 @@ RSpec.describe Gitlab::Redis::MultiStore, feature_category: :redis do context 'when FF table guard raises' do before do - allow(Feature::FlipperFeature).to receive(:table_exists?).and_raise(ActiveRecord::NoDatabaseError) + allow(Feature::FlipperFeature).to receive(:table_exists?).and_raise end it 'multi store is disabled' do diff --git a/spec/support/shared_examples/requests/rack_attack_shared_examples.rb b/spec/support/shared_examples/requests/rack_attack_shared_examples.rb index 3f457890f35..82ed6eb4c95 100644 --- a/spec/support/shared_examples/requests/rack_attack_shared_examples.rb +++ b/spec/support/shared_examples/requests/rack_attack_shared_examples.rb @@ -382,7 +382,7 @@ RSpec.shared_examples 'tracking when dry-run mode is set' do end def reset_rack_attack - Gitlab::Redis::RateLimiting.with(&:flushdb) + Rack::Attack.reset! Rack::Attack.clear_configuration Gitlab::RackAttack.configure(Rack::Attack) end |