Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 1 insertions, 11 deletions

diff --git a/spec/finders/feature_flags_finder_spec.rb b/spec/finders/feature_flags_finder_spec.rb
index 870447a1286..8744a186212 100644
--- a/spec/finders/feature_flags_finder_spec.rb
+++ b/spec/finders/feature_flags_finder_spec.rb
@@ -18,7 +18,7 @@ RSpec.describe FeatureFlagsFinder do
   end
 
   describe '#execute' do
-    subject { finder.execute(args) }
+    subject { finder.execute(**args) }
 
     let!(:feature_flag_1) { create(:operations_feature_flag, name: 'flag-a', project: project) }
     let!(:feature_flag_2) { create(:operations_feature_flag, name: 'flag-b', project: project) }
@@ -80,15 +80,5 @@ RSpec.describe FeatureFlagsFinder do
         is_expected.to eq([feature_flag_1, feature_flag_2, feature_flag_3])
       end
     end
-
-    context 'when new version flags are disabled' do
-      let!(:feature_flag_3) { create(:operations_feature_flag, :new_version_flag, name: 'flag-c', project: project) }
-
-      it 'returns only legacy flags' do
-        stub_feature_flags(feature_flags_new_version: false)
-
-        is_expected.to eq([feature_flag_1, feature_flag_2])
-      end
-    end
   end
 end