Add latest changes from gitlab-org/gitlab@master

1 files changed, 27 insertions, 18 deletions

diff --git a/spec/support/shared_contexts/ci/catalog/resources/version_shared_context.rb b/spec/support/shared_contexts/ci/catalog/resources/version_shared_context.rb
index 3eeaa52d221..a451608a5cc 100644
--- a/spec/support/shared_contexts/ci/catalog/resources/version_shared_context.rb
+++ b/spec/support/shared_contexts/ci/catalog/resources/version_shared_context.rb
@@ -1,33 +1,42 @@
 # frozen_string_literal: true
 
+# This context generates two catalog resources, each with two releases/versions.
+# `resource1` has versions `v1.0` and `v1.1`, with releases that have real commit shas.
+# `resource2` has versions `v2.0` and `v2.1`.
 RSpec.shared_context 'when there are catalog resources with versions' do
   let_it_be(:current_user) { create(:user) }
 
-  let_it_be(:project1) { create(:project, :repository, name: 'A') }
-  let_it_be(:project2) { create(:project, :repository, name: 'Z') }
-  let_it_be(:project3) { create(:project, :repository, name: 'L', description: 'Z') }
+  let_it_be(:project1) { create(:project, :custom_repo, files: { 'README.md' => 'Readme v1.0' }) }
+  let_it_be(:project2) { create(:project, :repository) }
+
   let_it_be_with_reload(:resource1) { create(:ci_catalog_resource, project: project1) }
   let_it_be_with_reload(:resource2) { create(:ci_catalog_resource, project: project2) }
-  let_it_be(:resource3) { create(:ci_catalog_resource, project: project3) }
 
-  let_it_be_with_reload(:release_v1_0) { create(:release, project: project1, tag: 'v1.0', released_at: 4.days.ago) }
-  let_it_be(:release_v1_1) { create(:release, project: project1, tag: 'v1.1', released_at: 3.days.ago) }
-  let_it_be(:release_v2_0) { create(:release, project: project2, tag: 'v2.0', released_at: 2.days.ago) }
-  let_it_be(:release_v2_1) { create(:release, project: project2, tag: 'v2.1', released_at: 1.day.ago) }
+  let(:v1_0) { resource1.versions.by_name('v1.0').first }
+  let(:v1_1) { resource1.versions.by_name('v1.1').first }
+  let(:v2_0) { resource2.versions.by_name('v2.0').first }
+  let(:v2_1) { resource2.versions.by_name('v2.1').first }
 
-  let_it_be(:v1_0) do
-    create(:ci_catalog_resource_version, catalog_resource: resource1, release: release_v1_0, created_at: 1.day.ago)
-  end
+  before_all do
+    project1.repository.create_branch('branch_v1.1', project1.default_branch)
 
-  let_it_be(:v1_1) do
-    create(:ci_catalog_resource_version, catalog_resource: resource1, release: release_v1_1, created_at: 2.days.ago)
-  end
+    project1.repository.update_file(
+      current_user, 'README.md', 'Readme v1.1', message: 'Update readme', branch_name: 'branch_v1.1')
 
-  let_it_be(:v2_0) do
-    create(:ci_catalog_resource_version, catalog_resource: resource2, release: release_v2_0, created_at: 3.days.ago)
-  end
+    tag_v1_0 = project1.repository.add_tag(current_user, 'v1.0', project1.default_branch)
+    tag_v1_1 = project1.repository.add_tag(current_user, 'v1.1', 'branch_v1.1')
+
+    release_v1_0 = create(:release, project: project1, tag: 'v1.0', released_at: 4.days.ago,
+      sha: tag_v1_0.dereferenced_target.sha)
+    release_v1_1 = create(:release, project: project1, tag: 'v1.1', released_at: 3.days.ago,
+      sha: tag_v1_1.dereferenced_target.sha)
+
+    release_v2_0 = create(:release, project: project2, tag: 'v2.0', released_at: 2.days.ago)
+    release_v2_1 = create(:release, project: project2, tag: 'v2.1', released_at: 1.day.ago)
 
-  let_it_be(:v2_1) do
+    create(:ci_catalog_resource_version, catalog_resource: resource1, release: release_v1_0, created_at: 1.day.ago)
+    create(:ci_catalog_resource_version, catalog_resource: resource1, release: release_v1_1, created_at: 2.days.ago)
+    create(:ci_catalog_resource_version, catalog_resource: resource2, release: release_v2_0, created_at: 3.days.ago)
     create(:ci_catalog_resource_version, catalog_resource: resource2, release: release_v2_1, created_at: 4.days.ago)
   end
 end