Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

2 files changed, 43 insertions, 0 deletions

diff --git a/spec/workers/design_management/copy_design_collection_worker_spec.rb b/spec/workers/design_management/copy_design_collection_worker_spec.rb
new file mode 100644
index 00000000000..45bfc47ca7e
--- /dev/null
+++ b/spec/workers/design_management/copy_design_collection_worker_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe DesignManagement::CopyDesignCollectionWorker, :clean_gitlab_redis_shared_state do
+  describe '#perform' do
+    let_it_be(:user) { create(:user) }
+    let_it_be(:issue) { create(:issue) }
+    let_it_be(:target_issue) { create(:issue) }
+
+    subject { described_class.new.perform(user.id, issue.id, target_issue.id) }
+
+    it_behaves_like 'an idempotent worker' do
+      let(:job_args) { [user.id, issue.id, target_issue.id] }
+
+      specify { subject }
+    end
+
+    it 'calls DesignManagement::CopyDesignCollection::CopyService' do
+      expect_next_instance_of(DesignManagement::CopyDesignCollection::CopyService) do |service|
+        expect(service).to receive(:execute).and_return(ServiceResponse.success)
+      end
+
+      subject
+    end
+
+    it 'logs if there was an error calling the service' do
+      message = 'Error message'
+
+      allow_next_instance_of(DesignManagement::CopyDesignCollection::CopyService) do |service|
+        allow(service).to receive(:execute).and_return(ServiceResponse.error(message: message))
+      end
+
+      expect(Gitlab::AppLogger).to receive(:warn).with(message)
+
+      subject
+    end
+  end
+end
diff --git a/spec/workers/design_management/new_version_worker_spec.rb b/spec/workers/design_management/new_version_worker_spec.rb
index 4d57c46487e..3320d7a062d 100644
--- a/spec/workers/design_management/new_version_worker_spec.rb
+++ b/spec/workers/design_management/new_version_worker_spec.rb
@@ -36,6 +36,10 @@ RSpec.describe DesignManagement::NewVersionWorker do
         expect { worker.perform(version.id) }.to change { Note.system.count }.by(1)
       end
 
+      it 'does not create a system note if skip_system_notes is true' do
+        expect { worker.perform(version.id, true) }.not_to change { Note.system.count }
+      end
+
       it 'invokes GenerateImageVersionsService' do
         expect_next_instance_of(DesignManagement::GenerateImageVersionsService) do |service|
           expect(service).to receive(:execute)