diff options
| author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2019-01-03 10:59:14 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2019-01-08 00:27:29 +0100 |
| commit | a2842241d4f583625053aba4d2c37a2f15b21913 (patch) | |
| tree | 088aeb8c89c56e20ea5f003e3556584b5b524232 /spec/controllers | |
| parent | cfa7108210490704a8110ee97a26de9ae4d9adaf (diff) | |
| download | gitlab-ce-a2842241d4f583625053aba4d2c37a2f15b21913.tar.gz | |
Add committers and authors methods on MergeRequest
These are used by the EE-only approvers feature
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/projects/merge_requests/creations_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/merge_requests/creations_controller_spec.rb b/spec/controllers/projects/merge_requests/creations_controller_spec.rb index ac93393ac3a..f031a74c5bd 100644 --- a/spec/controllers/projects/merge_requests/creations_controller_spec.rb +++ b/spec/controllers/projects/merge_requests/creations_controller_spec.rb @@ -71,7 +71,7 @@ describe Projects::MergeRequests::CreationsController do expect(response).to be_success total = assigns(:total_commit_count) - expect(assigns(:commits)).to be_an Array + expect(assigns(:commits)).to be_an CommitCollection expect(total).to be > 0 expect(assigns(:hidden_commit_count)).to eq(0) expect(response).to have_gitlab_http_status(200) |