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

1 files changed, 2 insertions, 6 deletions

diff --git a/spec/controllers/concerns/sourcegraph_decorator_spec.rb b/spec/controllers/concerns/sourcegraph_decorator_spec.rb
index f1f3f0489c6..2fca5a606d8 100644
--- a/spec/controllers/concerns/sourcegraph_decorator_spec.rb
+++ b/spec/controllers/concerns/sourcegraph_decorator_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SourcegraphDecorator do
+RSpec.describe SourcegraphDecorator do
   let_it_be(:enabled_user) { create(:user, sourcegraph_enabled: true) }
   let_it_be(:disabled_user) { create(:user, sourcegraph_enabled: false) }
   let_it_be(:public_project) { create(:project, :public) }
@@ -25,7 +25,7 @@ describe SourcegraphDecorator do
   end
 
   before do
-    Feature.get(:sourcegraph).enable(feature_enabled)
+    stub_feature_flags(sourcegraph: feature_enabled)
 
     stub_application_setting(sourcegraph_url: sourcegraph_url, sourcegraph_enabled: sourcegraph_enabled, sourcegraph_public_only: sourcegraph_public_only)
 
@@ -36,10 +36,6 @@ describe SourcegraphDecorator do
     sign_in user if user
   end
 
-  after do
-    Feature.get(:sourcegraph).disable
-  end
-
   subject do
     get :index, format: format