Fix flaky test on set_runner_associated_projects_service_spec.rb

app/services/ci/runners/set_runner_associated_projects_service.rb

@@ -41,7 +41,9 @@ def set_associated_projects
       end
 
       def associate_new_projects(new_project_ids, current_project_ids)
-        missing_projects = Project.id_in(new_project_ids - current_project_ids)
+        missing_projects =
+          Project.id_in(new_project_ids - current_project_ids)
+           .sort_by { |project| new_project_ids.index(project.id) }
 
         error_responses = missing_projects.map do |project|
           Ci::Runners::AssignRunnerService.new(runner, project, current_user, quiet: true)

spec/services/ci/runners/set_runner_associated_projects_service_spec.rb

@@ -60,7 +60,7 @@
           runner.reload
 
           expect(runner.owner).to eq(owner_project)
-          expect(runner.runner_projects.order(:id).map(&:project_id)).to eq([owner_project, *new_projects].map(&:id))
+          expect(runner.runner_projects.map(&:project_id)).to eq([owner_project, *new_projects].map(&:id))
         end
       end
 
@@ -73,7 +73,7 @@
           runner.reload
 
           expect(runner.owner).to eq(owner_project)
-          expect(runner.runner_projects.order(:id).map(&:project_id)).to eq([owner_project, *new_projects].map(&:id))
+          expect(runner.runner_projects.map(&:project_id)).to eq([owner_project, *new_projects].map(&:id))
         end
       end
 
@@ -205,7 +205,19 @@
             runner.reload
 
             expect(runner.owner).to eq(owner_project)
-            expect(runner.runner_projects.order(:id).map(&:project_id)).to eq(new_projects.map(&:id))
+            expect(runner.runner_projects.map(&:project_id)).to eq(new_projects.map(&:id))
+          end
+
+          context 'with different owner' do
+            let(:new_projects) { [project4, project3] }
+
+            it 'assigns correct owner and returns success response' do
+              expect(execute).to be_success
+
+              runner.reload
+
+              expect(runner.owner).to eq(owner_project)
+            end
           end
         end