Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

2 files changed, 14 insertions, 7 deletions

diff --git a/spec/support/shared_contexts/requests/api/conan_packages_shared_context.rb b/spec/support/shared_contexts/requests/api/conan_packages_shared_context.rb
index f3bbb325475..ac53be1a1cb 100644
--- a/spec/support/shared_contexts/requests/api/conan_packages_shared_context.rb
+++ b/spec/support/shared_contexts/requests/api/conan_packages_shared_context.rb
@@ -41,13 +41,6 @@ RSpec.shared_context 'conan recipe endpoints' do
   let(:jwt) { build_jwt(personal_access_token) }
   let(:headers) { build_token_auth_header(jwt.encoded) }
   let(:conan_package_reference) { '123456789' }
-  let(:presenter) { double('::Packages::Conan::PackagePresenter') }
-
-  before do
-    allow(::Packages::Conan::PackagePresenter).to receive(:new)
-      .with(package, user, package.project, any_args)
-      .and_return(presenter)
-  end
 end
 
 RSpec.shared_context 'conan file download endpoints' do
diff --git a/spec/support/shared_contexts/requests/api/go_modules_shared_context.rb b/spec/support/shared_contexts/requests/api/go_modules_shared_context.rb
new file mode 100644
index 00000000000..5a90c3076b1
--- /dev/null
+++ b/spec/support/shared_contexts/requests/api/go_modules_shared_context.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+RSpec.shared_context 'basic Go module' do
+  let_it_be(:user) { create :user }
+  let_it_be(:project) { create :project_empty_repo, creator: user, path: 'my-go-lib' }
+
+  let_it_be(:commit_v1_0_0) { create :go_module_commit, :files,   project: project, tag: 'v1.0.0', files: { 'README.md' => 'Hi' }        }
+  let_it_be(:commit_v1_0_1) { create :go_module_commit, :module,  project: project, tag: 'v1.0.1'                                        }
+  let_it_be(:commit_v1_0_2) { create :go_module_commit, :package, project: project, tag: 'v1.0.2', path: 'pkg'                           }
+  let_it_be(:commit_v1_0_3) { create :go_module_commit, :module,  project: project, tag: 'v1.0.3', name: 'mod'                           }
+  let_it_be(:commit_file_y) { create :go_module_commit, :files,   project: project,                files: { 'y.go' => "package a\n" }    }
+  let_it_be(:commit_mod_v2) { create :go_module_commit, :module,  project: project,                name: 'v2'                            }
+  let_it_be(:commit_v2_0_0) { create :go_module_commit, :files,   project: project, tag: 'v2.0.0', files: { 'v2/x.go' => "package a\n" } }
+end