Add latest changes from gitlab-org/gitlab@16-4-stable-eev16.4.0-rc42

1 files changed, 16 insertions, 0 deletions

diff --git a/spec/finders/deployments_finder_spec.rb b/spec/finders/deployments_finder_spec.rb
index 5a803ee2a0d..807a7ca8e26 100644
--- a/spec/finders/deployments_finder_spec.rb
+++ b/spec/finders/deployments_finder_spec.rb
@@ -280,6 +280,22 @@ RSpec.describe DeploymentsFinder, feature_category: :deployment_management do
           it { is_expected.to match_array([deployment_2]) }
         end
       end
+
+      context 'with mixed deployable types' do
+        let!(:deployment_1) do
+          create(:deployment, :success, project: project, deployable: create(:ci_build))
+        end
+
+        let!(:deployment_2) do
+          create(:deployment, :success, project: project, deployable: create(:ci_bridge))
+        end
+
+        let(:params) { { **base_params, status: 'success' } }
+
+        it 'successfuly fetches deployments' do
+          is_expected.to contain_exactly(deployment_1, deployment_2)
+        end
+      end
     end
 
     context 'at group scope' do