diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2016-08-19 11:18:49 +0530 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2016-08-19 11:20:21 +0530 |
| commit | be3b6ac74bde84680a797944db173dcc9bd81022 (patch) | |
| tree | 42eb98ca70e311e4e7ea4478e359fd49e80b4762 | |
| parent | 579951720afcfa7d2fbef6f3dc2d2ca0d2816025 (diff) | |
| download | gitlab-ce-21081-repository-merge-in-progress-merge-commit-sha-spec.tar.gz | |
Add a spec testing a second side effect of `Repository#merge`.21081-repository-merge-in-progress-merge-commit-sha-spec
- It sets the `in_progress_merge_commit_sha` variable on the given merge
request, so that the branch permissions (developers can merge) check
can proceed in the `pre-receive` hook.
| -rw-r--r-- | spec/models/repository_spec.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index f7dbfd712cc..1fea50ad42c 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -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 |