Add latest changes from gitlab-org/gitlab@13-2-stable-ee

1 files changed, 5 insertions, 1 deletions

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 84de5119505..ed3211a9c87 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -103,7 +103,6 @@ RSpec.configure do |config|
   config.include ActiveJob::TestHelper
   config.include ActiveSupport::Testing::TimeHelpers
   config.include CycleAnalyticsHelpers
-  config.include ExpectOffense
   config.include FactoryBot::Syntax::Methods
   config.include FixtureHelpers
   config.include NonExistingRecordsHelpers
@@ -156,6 +155,9 @@ RSpec.configure do |config|
   config.before(:suite) do
     Timecop.safe_mode = true
     TestEnv.init
+
+    # Reload all feature flags definitions
+    Feature.register_definitions
   end
 
   config.after(:all) do
@@ -332,6 +334,8 @@ RSpec.configure do |config|
       Ability.allowed?(*args)
     end
   end
+
+  config.disable_monkey_patching!
 end
 
 ActiveRecord::Migration.maintain_test_schema!