Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 14 deletions

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 84c38ca0ce2..a3925a0c0fb 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -338,20 +338,10 @@ RSpec.configure do |config|
     RequestStore.clear!
   end
 
-  if ENV['SKIP_RSPEC_CONTEXT_WRAPPING']
-    config.around(:example, :context_aware) do |example|
-      # Wrap each example in it's own context to make sure the contexts don't
-      # leak
-      Gitlab::ApplicationContext.with_raw_context { example.run }
-    end
-  else
-    config.around do |example|
-      if [:controller, :request, :feature].include?(example.metadata[:type]) || example.metadata[:context_aware]
-        Gitlab::ApplicationContext.with_raw_context { example.run }
-      else
-        example.run
-      end
-    end
+  config.around do |example|
+    # Wrap each example in it's own context to make sure the contexts don't
+    # leak
+    Gitlab::ApplicationContext.with_raw_context { example.run }
   end
 
   config.around do |example|