diff options
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 38e3f851116..e8405934f62 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -8,6 +8,8 @@ if $".include?(File.expand_path('fast_spec_helper.rb', __dir__)) abort 'Aborting...' end +require './spec/deprecation_toolkit_env' + require './spec/simplecov_env' SimpleCovEnv.start! @@ -134,6 +136,7 @@ RSpec.configure do |config| config.include NextFoundInstanceOf config.include NextInstanceOf config.include TestEnv + config.include FileReadHelpers config.include Devise::Test::ControllerHelpers, type: :controller config.include Devise::Test::IntegrationHelpers, type: :feature config.include LoginHelpers, type: :feature @@ -215,10 +218,6 @@ RSpec.configure do |config| stub_feature_flags(vue_issuable_sidebar: false) stub_feature_flags(vue_issuable_epic_sidebar: false) - # The following can be removed once we are confident the - # unified diff lines works as expected - stub_feature_flags(unified_diff_lines: false) - # Merge request widget GraphQL requests are disabled in the tests # for now whilst we migrate as much as we can over the GraphQL stub_feature_flags(merge_request_widget_graphql: false) @@ -238,6 +237,8 @@ RSpec.configure do |config| # See https://gitlab.com/gitlab-org/gitlab/-/issues/33867 stub_feature_flags(file_identifier_hash: false) + stub_feature_flags(unified_diff_components: false) + allow(Gitlab::GitalyClient).to receive(:can_use_disk?).and_return(enable_rugged) else unstub_all_feature_flags @@ -279,24 +280,18 @@ RSpec.configure do |config| # context 'some test in mocked dir', :do_not_mock_admin_mode do ... end admin_mode_mock_dirs = %w( ./ee/spec/elastic_integration - ./ee/spec/features ./ee/spec/finders ./ee/spec/lib ./ee/spec/requests/admin ./ee/spec/serializers - ./ee/spec/support/protected_tags - ./ee/spec/support/shared_examples/features ./ee/spec/support/shared_examples/finders/geo ./ee/spec/support/shared_examples/graphql/geo - ./spec/features ./spec/finders ./spec/frontend ./spec/helpers ./spec/lib ./spec/requests ./spec/serializers - ./spec/support/protected_tags - ./spec/support/shared_examples/features ./spec/support/shared_examples/requests ./spec/support/shared_examples/lib/gitlab ./spec/views |