diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:40:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:40:42 +0300 |
commit | ee664acb356f8123f4f6b00b73c1e1cf0866c7fb (patch) | |
tree | f8479f94a28f66654c6a4f6fb99bad6b4e86a40e /spec/services/repositories/changelog_service_spec.rb | |
parent | 62f7d5c5b69180e82ae8196b7b429eeffc8e7b4f (diff) |
Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42
Diffstat (limited to 'spec/services/repositories/changelog_service_spec.rb')
-rw-r--r-- | spec/services/repositories/changelog_service_spec.rb | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/spec/services/repositories/changelog_service_spec.rb b/spec/services/repositories/changelog_service_spec.rb index 3615747e191..47ebd55022f 100644 --- a/spec/services/repositories/changelog_service_spec.rb +++ b/spec/services/repositories/changelog_service_spec.rb @@ -67,10 +67,11 @@ RSpec.describe Repositories::ChangelogService do allow(MergeRequestDiffCommit) .to receive(:oldest_merge_request_id_per_commit) .with(project.id, [commit2.id, commit1.id]) - .and_return([ - { sha: sha2, merge_request_id: mr1.id }, - { sha: sha3, merge_request_id: mr2.id } - ]) + .and_return( + [ + { sha: sha2, merge_request_id: mr1.id }, + { sha: sha3, merge_request_id: mr2.id } + ]) service = described_class .new(project, creator, version: '1.0.0', from: sha1, to: sha3) @@ -135,10 +136,11 @@ RSpec.describe Repositories::ChangelogService do allow(MergeRequestDiffCommit) .to receive(:oldest_merge_request_id_per_commit) .with(project.id, [commit2.id, commit1.id]) - .and_return([ - { sha: sha2, merge_request_id: mr1.id }, - { sha: sha3, merge_request_id: mr2.id } - ]) + .and_return( + [ + { sha: sha2, merge_request_id: mr1.id }, + { sha: sha3, merge_request_id: mr2.id } + ]) service = described_class .new(project, creator, version: '1.0.0', from: sha1, to: sha3) |