Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 10 insertions, 2 deletions

diff --git a/spec/lib/gitlab/ci/build/releaser_spec.rb b/spec/lib/gitlab/ci/build/releaser_spec.rb
index fa5e90674a6..435f70e9ac5 100644
--- a/spec/lib/gitlab/ci/build/releaser_spec.rb
+++ b/spec/lib/gitlab/ci/build/releaser_spec.rb
@@ -15,18 +15,25 @@ RSpec.describe Gitlab::Ci::Build::Releaser do
             tag_name: 'release-$CI_COMMIT_SHA',
             ref: '$CI_COMMIT_SHA',
             milestones: %w[m1 m2 m3],
-            released_at: '2020-07-15T08:00:00Z'
+            released_at: '2020-07-15T08:00:00Z',
+            assets: {
+              links: [
+                { name: 'asset1', url: 'https://example.com/assets/1', link_type: 'other', filepath: '/pretty/asset/1' },
+                { name: 'asset2', url: 'https://example.com/assets/2' }
+              ]
+            }
           }
         }
       end
 
       it 'generates the script' do
-        expect(subject).to eq(['release-cli create --name "Release $CI_COMMIT_SHA" --description "Created using the release-cli $EXTRA_DESCRIPTION" --tag-name "release-$CI_COMMIT_SHA" --ref "$CI_COMMIT_SHA" --released-at "2020-07-15T08:00:00Z" --milestone "m1" --milestone "m2" --milestone "m3"'])
+        expect(subject).to eq(['release-cli create --name "Release $CI_COMMIT_SHA" --description "Created using the release-cli $EXTRA_DESCRIPTION" --tag-name "release-$CI_COMMIT_SHA" --ref "$CI_COMMIT_SHA" --released-at "2020-07-15T08:00:00Z" --milestone "m1" --milestone "m2" --milestone "m3" --assets-link "{\"name\":\"asset1\",\"url\":\"https://example.com/assets/1\",\"link_type\":\"other\",\"filepath\":\"/pretty/asset/1\"}" --assets-link "{\"name\":\"asset2\",\"url\":\"https://example.com/assets/2\"}"'])
       end
     end
 
     context 'individual nodes' do
       using RSpec::Parameterized::TableSyntax
+      links = { links: [{ name: 'asset1', url: 'https://example.com/assets/1', link_type: 'other', filepath: '/pretty/asset/1' }] }
 
       where(:node_name, :node_value, :result) do
         :name        | 'Release $CI_COMMIT_SHA'         | 'release-cli create --name "Release $CI_COMMIT_SHA"'
@@ -35,6 +42,7 @@ RSpec.describe Gitlab::Ci::Build::Releaser do
         :ref         | '$CI_COMMIT_SHA'                 | 'release-cli create --ref "$CI_COMMIT_SHA"'
         :milestones  | %w[m1 m2 m3]                     | 'release-cli create --milestone "m1" --milestone "m2" --milestone "m3"'
         :released_at | '2020-07-15T08:00:00Z'           | 'release-cli create --released-at "2020-07-15T08:00:00Z"'
+        :assets      | links                            | "release-cli create --assets-link #{links[:links][0].to_json.to_json}"
       end
 
       with_them do