Merge branch '21081-repository-merge-in-progress-merge-commit-sha-spec' into 'master'
Add a spec testing a second side effect of `Repository#merge`. ## What are the relevant issue numbers? - Closes #21081 - Related to gitlab-org/gitlab-ee!671 - Related to gitlab-org/gitlab-ee#900 See merge request !5886
This commit is contained in:
commit
1f12700608
|
@ -719,6 +719,14 @@ describe Repository, models: true do
|
|||
expect(merge_commit).to be_present
|
||||
expect(repository.blob_at(merge_commit.id, 'files/ruby/feature.rb')).to be_present
|
||||
end
|
||||
|
||||
it 'sets the `in_progress_merge_commit_sha` flag for the given merge request' do
|
||||
merge_request = create(:merge_request, source_branch: 'feature', target_branch: 'master', source_project: project)
|
||||
merge_commit_id = repository.merge(user, merge_request, commit_options)
|
||||
repository.commit(merge_commit_id)
|
||||
|
||||
expect(merge_request.in_progress_merge_commit_sha).to eq(merge_commit_id)
|
||||
end
|
||||
end
|
||||
|
||||
describe '#revert' do
|
||||
|
|
Loading…
Reference in New Issue