Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

1 files changed, 15 insertions, 0 deletions

diff --git a/spec/services/ci/resource_groups/assign_resource_from_resource_group_service_spec.rb b/spec/services/ci/resource_groups/assign_resource_from_resource_group_service_spec.rb
index 194203a422c..3d1abe290bc 100644
--- a/spec/services/ci/resource_groups/assign_resource_from_resource_group_service_spec.rb
+++ b/spec/services/ci/resource_groups/assign_resource_from_resource_group_service_spec.rb
@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Ci::ResourceGroups::AssignResourceFromResourceGroupService do
+  include ConcurrentHelpers
+
   let_it_be(:project) { create(:project) }
   let_it_be(:user) { create(:user) }
 
@@ -134,6 +136,19 @@ RSpec.describe Ci::ResourceGroups::AssignResourceFromResourceGroupService do
           end
         end
       end
+
+      context 'when parallel services are running' do
+        it 'can run the same command in parallel' do
+          parallel_num = 4
+
+          blocks = Array.new(parallel_num).map do
+            -> { subject }
+          end
+
+          run_parallel(blocks)
+          expect(build.reload).to be_pending
+        end
+      end
     end
 
     context 'when there are no available resources' do