Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

1 files changed, 9 insertions, 1 deletions

diff --git a/spec/lib/gitlab/ci/status/bridge/common_spec.rb b/spec/lib/gitlab/ci/status/bridge/common_spec.rb
index 37524afc83d..30e6ad234a0 100644
--- a/spec/lib/gitlab/ci/status/bridge/common_spec.rb
+++ b/spec/lib/gitlab/ci/status/bridge/common_spec.rb
@@ -29,7 +29,15 @@ RSpec.describe Gitlab::Ci::Status::Bridge::Common do
       end
 
       it { expect(subject).to have_details }
-      it { expect(subject.details_path).to include "pipelines/#{downstream_pipeline.id}" }
+      it { expect(subject.details_path).to include "jobs/#{bridge.id}" }
+
+      context 'with ci_retry_downstream_pipeline ff disabled' do
+        before do
+          stub_feature_flags(ci_retry_downstream_pipeline: false)
+        end
+
+        it { expect(subject.details_path).to include "pipelines/#{downstream_pipeline.id}" }
+      end
     end
 
     context 'when user does not have access to read downstream pipeline' do