Add latest changes from gitlab-org/gitlab@master

1 files changed, 20 insertions, 0 deletions

diff --git a/spec/services/ci/register_job_service_spec.rb b/spec/services/ci/register_job_service_spec.rb
index 9187dd4f300..401a40bbb39 100644
--- a/spec/services/ci/register_job_service_spec.rb
+++ b/spec/services/ci/register_job_service_spec.rb
@@ -225,6 +225,26 @@ module Ci
             end
           end
 
+          context 'when the use_distinct_in_register_job_object_hierarchy feature flag is enabled' do
+            before do
+              stub_feature_flags(use_distinct_in_register_job_object_hierarchy: true)
+            end
+
+            it 'calls DISTINCT' do
+              expect(described_class.new(group_runner).send(:builds_for_group_runner).to_sql).to include("DISTINCT")
+            end
+          end
+
+          context 'when the use_distinct_in_register_job_object_hierarchy feature flag is disabled' do
+            before do
+              stub_feature_flags(use_distinct_in_register_job_object_hierarchy: false)
+            end
+
+            it 'does not call DISTINCT' do
+              expect(described_class.new(group_runner).send(:builds_for_group_runner).to_sql).not_to include("DISTINCT")
+            end
+          end
+
           context 'group runner' do
             let(:build) { execute(group_runner) }