Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 0 deletions

diff --git a/spec/bin/changelog_spec.rb b/spec/bin/changelog_spec.rb
index c3a5abf2b7a..ce7f7648c0c 100644
--- a/spec/bin/changelog_spec.rb
+++ b/spec/bin/changelog_spec.rb
@@ -69,6 +69,14 @@ describe 'bin/changelog' do
         end
       end
 
+      it 'parses --ee and -e' do
+        %w[--ee -e].each do |flag|
+          options = described_class.parse(%W[foo #{flag} security])
+
+          expect(options.ee).to eq true
+        end
+      end
+
       it 'parses -h' do
         expect do
           expect { described_class.parse(%w[foo -h bar]) }.to output.to_stdout