Add latest changes from gitlab-org/gitlab@master

2 files changed, 36 insertions, 2 deletions

diff --git a/spec/workers/ci/resource_groups/assign_resource_from_resource_group_worker_spec.rb b/spec/workers/ci/resource_groups/assign_resource_from_resource_group_worker_spec.rb
new file mode 100644
index 00000000000..634d932121e
--- /dev/null
+++ b/spec/workers/ci/resource_groups/assign_resource_from_resource_group_worker_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Ci::ResourceGroups::AssignResourceFromResourceGroupWorker do
+  let(:worker) { described_class.new }
+
+  describe '#perform' do
+    subject { worker.perform(resource_group_id) }
+
+    context 'when resource group exists' do
+      let(:resource_group) { create(:ci_resource_group) }
+      let(:resource_group_id) { resource_group.id }
+
+      it 'executes AssignResourceFromResourceGroupService' do
+        expect_next_instance_of(Ci::ResourceGroups::AssignResourceFromResourceGroupService, resource_group.project, nil) do |service|
+          expect(service).to receive(:execute).with(resource_group)
+        end
+
+        subject
+      end
+    end
+
+    context 'when build does not exist' do
+      let(:resource_group_id) { 123 }
+
+      it 'does not execute AssignResourceFromResourceGroupService' do
+        expect(Ci::ResourceGroups::AssignResourceFromResourceGroupService).not_to receive(:new)
+
+        subject
+      end
+    end
+  end
+end
diff --git a/spec/workers/git_garbage_collect_worker_spec.rb b/spec/workers/git_garbage_collect_worker_spec.rb
index cc1c23bb9e7..64ad4ba7eb6 100644
--- a/spec/workers/git_garbage_collect_worker_spec.rb
+++ b/spec/workers/git_garbage_collect_worker_spec.rb
@@ -230,8 +230,8 @@ describe GitGarbageCollectWorker do
     new_commit_sha = Rugged::Commit.create(
       rugged,
       message: "hello world #{SecureRandom.hex(6)}",
-      author: Gitlab::Git.committer_hash(email: 'foo@bar', name: 'baz'),
-      committer: Gitlab::Git.committer_hash(email: 'foo@bar', name: 'baz'),
+      author: { email: 'foo@bar', name: 'baz' },
+      committer: { email: 'foo@bar', name: 'baz' },
       tree: old_commit.tree,
       parents: [old_commit]
     )