Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

2 files changed, 39 insertions, 1 deletions

diff --git a/spec/tasks/gitlab/gitaly_rake_spec.rb b/spec/tasks/gitlab/gitaly_rake_spec.rb
index c59370a7a32..efc983d526f 100644
--- a/spec/tasks/gitlab/gitaly_rake_spec.rb
+++ b/spec/tasks/gitlab/gitaly_rake_spec.rb
@@ -89,7 +89,7 @@ RSpec.describe 'gitlab:gitaly namespace rake task' do
           let(:command) do
             %W[make
                BUNDLE_FLAGS=--no-deployment
-               BUNDLE_PATH=#{Bundler.bundle_path}]
+               GEM_HOME=#{Bundler.bundle_path}]
           end
 
           before do
diff --git a/spec/tasks/gitlab/packages/events_rake_spec.rb b/spec/tasks/gitlab/packages/events_rake_spec.rb
new file mode 100644
index 00000000000..ac28f9b5fc2
--- /dev/null
+++ b/spec/tasks/gitlab/packages/events_rake_spec.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'rake_helper'
+
+RSpec.describe 'gitlab:packages:events namespace rake task' do
+  before :all do
+    Rake.application.rake_require 'tasks/gitlab/packages/events'
+  end
+
+  describe 'generate' do
+    subject do
+      file = double('file')
+      yml_file = nil
+
+      allow(file).to receive(:<<) { |contents| yml_file = contents }
+      allow(File).to receive(:open).and_yield(file)
+
+      run_rake_task('gitlab:packages:events:generate')
+
+      YAML.safe_load(yml_file)
+    end
+
+    it 'excludes guest events' do
+      expect(subject.find { |event| event['name'].include?("guest") }).to be_nil
+    end
+
+    ::Packages::Event::EVENT_SCOPES.keys.each do |event_scope|
+      it "includes includes `#{event_scope}` scope" do
+        expect(subject.find { |event| event['name'].include?(event_scope) }).not_to be_nil
+      end
+    end
+
+    it 'excludes some event types' do
+      expect(subject.find { |event| event['name'].include?("search_package") }).to be_nil
+      expect(subject.find { |event| event['name'].include?("list_package") }).to be_nil
+    end
+  end
+end