diff options
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 02db905b8b1..2dd4e92eee9 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -24,7 +24,6 @@ CrystalballEnv.start! ENV["RAILS_ENV"] = 'test' ENV["IN_MEMORY_APPLICATION_SETTINGS"] = 'true' ENV["RSPEC_ALLOW_INVALID_URLS"] = 'true' -ENV['USE_CI_BUILDS_ROUTING_TABLE'] = 'true' require_relative '../config/environment' @@ -302,13 +301,6 @@ RSpec.configure do |config| # https://gitlab.com/gitlab-org/gitlab/-/issues/385453 stub_feature_flags(vscode_web_ide: false) - enable_rugged = example.metadata[:enable_rugged].present? - - # Disable Rugged features by default - Gitlab::Git::RuggedImpl::Repository::FEATURE_FLAGS.each do |flag| - stub_feature_flags(flag => enable_rugged) - end - # Disable `main_branch_over_master` as we migrate # from `master` to `main` accross our codebase. # It's done in order to preserve the concistency in tests @@ -336,8 +328,6 @@ RSpec.configure do |config| stub_feature_flags(clickhouse_data_collection: false) stub_feature_flags(vite: false) - - allow(Gitlab::GitalyClient).to receive(:can_use_disk?).and_return(enable_rugged) else unstub_all_feature_flags end @@ -394,11 +384,6 @@ RSpec.configure do |config| ::Gitlab::SafeRequestStore.ensure_request_store { example.run } end - config.around(:example, :enable_rugged) do |example| - # Skip tests that need rugged when using praefect DB. - example.run unless GitalySetup.praefect_with_db? - end - config.around(:example, :yaml_processor_feature_flag_corectness) do |example| ::Gitlab::Ci::YamlProcessor::FeatureFlags.ensure_correct_usage do example.run |