Add latest changes from gitlab-org/gitlab@master

2 files changed, 29 insertions, 2 deletions

diff --git a/spec/support/helpers/modal_helpers.rb b/spec/support/helpers/modal_helpers.rb
new file mode 100644
index 00000000000..a1f03cc0da5
--- /dev/null
+++ b/spec/support/helpers/modal_helpers.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Spec
+  module Support
+    module Helpers
+      module ModalHelpers
+        def within_modal
+          page.within('[role="dialog"]') do
+            yield
+          end
+        end
+
+        def accept_gl_confirm(text = nil, button_text: 'OK')
+          yield if block_given?
+
+          within_modal do
+            unless text.nil?
+              expect(page).to have_content(text)
+            end
+
+            click_button button_text
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/support/shared_examples/requests/api/nuget_packages_shared_examples.rb b/spec/support/shared_examples/requests/api/nuget_packages_shared_examples.rb
index 878cbc10a24..6568d51b90e 100644
--- a/spec/support/shared_examples/requests/api/nuget_packages_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/nuget_packages_shared_examples.rb
@@ -391,7 +391,7 @@ RSpec.shared_examples 'rejects nuget access with invalid target id' do
   context 'with a target id with invalid integers' do
     using RSpec::Parameterized::TableSyntax
 
-    let(:target) { OpenStruct.new(id: id) }
+    let(:target) { double(id: id) }
 
     where(:id, :status) do
       '/../'       | :bad_request
@@ -411,7 +411,7 @@ end
 
 RSpec.shared_examples 'rejects nuget access with unknown target id' do
   context 'with an unknown target' do
-    let(:target) { OpenStruct.new(id: 1234567890) }
+    let(:target) { double(id: 1234567890) }
 
     context 'as anonymous' do
       it_behaves_like 'rejects nuget packages access', :anonymous, :unauthorized