summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests/refresh_service_spec.rb
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2019-02-25 20:05:26 +0900
committerShinya Maeda <shinya@gitlab.com>2019-03-01 22:52:38 +0900
commitf62dc67d262792829bdcaef779b3915e9cc93a4f (patch)
treef9419e96914addb59dfa4ab653c9c6151b33e4e2 /spec/services/merge_requests/refresh_service_spec.rb
parentdc5fc28382246fbbe2bb6f61fe8dac136b5f3189 (diff)
downloadgitlab-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/refresh_service_spec.rb')
-rw-r--r--spec/services/merge_requests/refresh_service_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb
index 9e9dc5a576c..43ceb1dcbee 100644
--- a/spec/services/merge_requests/refresh_service_spec.rb
+++ b/spec/services/merge_requests/refresh_service_spec.rb
@@ -173,12 +173,12 @@ describe MergeRequests::RefreshService do
it 'sets the latest merge request pipeline as a head pipeline' do
@merge_request.reload
- expect(@merge_request.actual_head_pipeline).to be_merge_request
+ expect(@merge_request.actual_head_pipeline).to be_merge_request_event
end
it 'returns pipelines in correct order' do
@merge_request.reload
- expect(@merge_request.all_pipelines.first).to be_merge_request
+ expect(@merge_request.all_pipelines.first).to be_merge_request_event
expect(@merge_request.all_pipelines.second).to be_push
end
end