Add latest changes from gitlab-org/security/gitlab@15-5-stable-ee

2 files changed, 9 insertions, 2 deletions

diff --git a/spec/features/projects/issues/design_management/user_views_designs_with_svg_xss_spec.rb b/spec/features/projects/issues/design_management/user_views_designs_with_svg_xss_spec.rb
index 0fe84ab47ed..682a45cf592 100644
--- a/spec/features/projects/issues/design_management/user_views_designs_with_svg_xss_spec.rb
+++ b/spec/features/projects/issues/design_management/user_views_designs_with_svg_xss_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe 'User views an SVG design that contains XSS', :js do
     expect(file_content).to include("<script>alert('FAIL')</script>")
   end
 
-  it 'displays the SVG' do
+  it 'displays the SVG', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/381115' do
     find("[data-testid='close-design']").click
     expect(page).to have_selector("img.design-img[alt='xss.svg']", count: 1, visible: false)
   end
diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb
index 1190b0f3558..eabbcd5e38e 100644
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
@@ -342,11 +342,18 @@ RSpec.describe 'Pipelines', :js do
         end
 
         context 'when user played a delayed job immediately' do
+          let(:manual_action_selector) { '[data-testid="pipelines-manual-actions-dropdown"]' }
+
           before do
-            find('[data-testid="pipelines-manual-actions-dropdown"]').click
+            find(manual_action_selector).click
             accept_gl_confirm do
               click_button 'delayed job 1'
             end
+
+            # Wait for UI to transition to ensure a request has been made
+            within(manual_action_selector) { find('.gl-spinner') }
+            within(manual_action_selector) { find('[data-testid="play-icon"]') }
+
             wait_for_requests
           end