diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-02-25 20:05:26 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-03-01 22:52:38 +0900 |
| commit | f62dc67d262792829bdcaef779b3915e9cc93a4f (patch) | |
| tree | f9419e96914addb59dfa4ab653c9c6151b33e4e2 /spec/services/merge_requests/create_service_spec.rb | |
| parent | dc5fc28382246fbbe2bb6f61fe8dac136b5f3189 (diff) | |
| download | gitlab-ce-f62dc67d262792829bdcaef779b3915e9cc93a4f.tar.gz | |
Add suffix for merge request event
Fix
ok
Add spec
Fix
ok
Fix
Add changelog
Fix
Add memoization
a
fix
Diffstat (limited to 'spec/services/merge_requests/create_service_spec.rb')
| -rw-r--r-- | spec/services/merge_requests/create_service_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/merge_requests/create_service_spec.rb b/spec/services/merge_requests/create_service_spec.rb index b46aa65818d..a04a4d5fc36 100644 --- a/spec/services/merge_requests/create_service_spec.rb +++ b/spec/services/merge_requests/create_service_spec.rb @@ -194,7 +194,7 @@ describe MergeRequests::CreateService do merge_request.reload expect(merge_request.merge_request_pipelines.count).to eq(1) - expect(merge_request.actual_head_pipeline).to be_merge_request + expect(merge_request.actual_head_pipeline).to be_merge_request_event end context 'when there are no commits between source branch and target branch' do @@ -226,7 +226,7 @@ describe MergeRequests::CreateService do end it 'sets the latest merge request pipeline as the head pipeline' do - expect(merge_request.actual_head_pipeline).to be_merge_request + expect(merge_request.actual_head_pipeline).to be_merge_request_event end end |