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 | |
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')
-rw-r--r-- | spec/services/ci/create_pipeline_service_spec.rb | 4 | ||||
-rw-r--r-- | spec/services/merge_requests/create_service_spec.rb | 4 | ||||
-rw-r--r-- | spec/services/merge_requests/refresh_service_spec.rb | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/spec/services/ci/create_pipeline_service_spec.rb b/spec/services/ci/create_pipeline_service_spec.rb index 93349ba7b5b..24707cd2d41 100644 --- a/spec/services/ci/create_pipeline_service_spec.rb +++ b/spec/services/ci/create_pipeline_service_spec.rb @@ -701,7 +701,7 @@ describe Ci::CreatePipelineService do let(:target_sha) { nil } context 'when source is merge request' do - let(:source) { :merge_request } + let(:source) { :merge_request_event } context "when config has merge_requests keywords" do let(:config) do @@ -734,7 +734,7 @@ describe Ci::CreatePipelineService do it 'creates a merge request pipeline' do expect(pipeline).to be_persisted - expect(pipeline).to be_merge_request + expect(pipeline).to be_merge_request_event expect(pipeline.merge_request).to eq(merge_request) expect(pipeline.builds.order(:stage_id).map(&:name)).to eq(%w[test]) end 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 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 |