Add latest changes from gitlab-org/gitlab@master

1 files changed, 13 insertions, 4 deletions

diff --git a/spec/bin/feature_flag_spec.rb b/spec/bin/feature_flag_spec.rb
index a30e5032d38..185a03fc587 100644
--- a/spec/bin/feature_flag_spec.rb
+++ b/spec/bin/feature_flag_spec.rb
@@ -8,10 +8,6 @@ load File.expand_path('../../bin/feature-flag', __dir__)
 RSpec.describe 'bin/feature-flag' do
   using RSpec::Parameterized::TableSyntax
 
-  before do
-    skip_feature_flags_yaml_validation
-  end
-
   describe FeatureFlagCreator do
     let(:argv) { %w[feature-flag-name -t development -g group::memory -i https://url -m http://url] }
     let(:options) { FeatureFlagOptionParser.parse(argv) }
@@ -244,5 +240,18 @@ RSpec.describe 'bin/feature-flag' do
         end
       end
     end
+
+    describe '.read_ee_only' do
+      where(:type, :is_ee_only) do
+        :development | false
+        :licensed    | true
+      end
+
+      with_them do
+        let(:options) { OpenStruct.new(name: 'foo', type: type) }
+
+        it { expect(described_class.read_ee_only(options)).to eq(is_ee_only) }
+      end
+    end
   end
 end