Add latest changes from gitlab-org/gitlab@master

1 files changed, 31 insertions, 0 deletions

diff --git a/spec/workers/approve_blocked_pending_approval_users_worker_spec.rb b/spec/workers/approve_blocked_pending_approval_users_worker_spec.rb
new file mode 100644
index 00000000000..bd603bd870d
--- /dev/null
+++ b/spec/workers/approve_blocked_pending_approval_users_worker_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe ApproveBlockedPendingApprovalUsersWorker, type: :worker do
+  let_it_be(:admin) { create(:admin) }
+  let_it_be(:active_user) { create(:user) }
+  let_it_be(:blocked_user) { create(:user, state: 'blocked_pending_approval') }
+
+  describe '#perform' do
+    subject do
+      described_class.new.perform(admin.id)
+    end
+
+    it 'calls ApproveService for users in blocked_pending_approval state' do
+      expect_next_instance_of(Users::ApproveService, admin) do |service|
+        expect(service).to receive(:execute).with(blocked_user)
+      end
+
+      subject
+    end
+
+    it 'does not call ApproveService for active users' do
+      expect_next_instance_of(Users::ApproveService, admin) do |service|
+        expect(service).not_to receive(:execute).with(active_user)
+      end
+
+      subject
+    end
+  end
+end