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

1 files changed, 4 insertions, 6 deletions

diff --git a/spec/lib/gitlab/gon_helper_spec.rb b/spec/lib/gitlab/gon_helper_spec.rb
index 1ff2334bacf..7b0e0d01257 100644
--- a/spec/lib/gitlab/gon_helper_spec.rb
+++ b/spec/lib/gitlab/gon_helper_spec.rb
@@ -12,21 +12,19 @@ describe Gitlab::GonHelper do
   describe '#push_frontend_feature_flag' do
     it 'pushes a feature flag to the frontend' do
       gon = instance_double('gon')
+      thing = stub_feature_flag_gate('thing')
+
+      stub_feature_flags(my_feature_flag: thing)
 
       allow(helper)
         .to receive(:gon)
         .and_return(gon)
 
-      expect(Feature)
-        .to receive(:enabled?)
-        .with(:my_feature_flag, 10)
-        .and_return(true)
-
       expect(gon)
         .to receive(:push)
         .with({ features: { 'myFeatureFlag' => true } }, true)
 
-      helper.push_frontend_feature_flag(:my_feature_flag, 10)
+      helper.push_frontend_feature_flag(:my_feature_flag, thing)
     end
   end