Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

1 files changed, 2 insertions, 10 deletions

diff --git a/spec/lib/gitlab/lograge/custom_options_spec.rb b/spec/lib/gitlab/lograge/custom_options_spec.rb
index d8f351bb8a3..58b05be6ff9 100644
--- a/spec/lib/gitlab/lograge/custom_options_spec.rb
+++ b/spec/lib/gitlab/lograge/custom_options_spec.rb
@@ -96,23 +96,15 @@ RSpec.describe Gitlab::Lograge::CustomOptions do
       end
     end
 
-    context  'when feature flags are present', :request_store do
+    context 'when feature flags are present', :request_store do
       before do
         allow(Feature).to receive(:log_feature_flag_states?).and_return(false)
 
-        definitions = {}
         [:enabled_feature, :disabled_feature].each do |flag_name|
-          definitions[flag_name] = Feature::Definition.new("development/enabled_feature.yml",
-                                                           name: flag_name,
-                                                           type: 'development',
-                                                           log_state_changes: true,
-                                                           default_enabled: false)
-
+          stub_feature_flag_definition(flag_name, log_state_changes: true)
           allow(Feature).to receive(:log_feature_flag_states?).with(flag_name).and_call_original
         end
 
-        allow(Feature::Definition).to receive(:definitions).and_return(definitions)
-
         Feature.enable(:enabled_feature)
         Feature.disable(:disabled_feature)
       end