diff options
author | Shinya Maeda <shinya@gitlab.com> | 2017-08-29 01:21:50 +0900 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2017-08-29 01:21:50 +0900 |
commit | 4401b7595510a6126a1d38b5743113777ad9aa2f (patch) | |
tree | 7d6c66e3c3802d05a88865059d383bf5e49232a1 /spec | |
parent | 9b7a0ecf59cca248681b7837b706428e86bb1da4 (diff) | |
download | gitlab-ce-4401b7595510a6126a1d38b5743113777ad9aa2f.tar.gz |
Fix specfix/sm/37040-regression-pipeline-trigger-via-api-fails-with-500-internal-server-error-in-9-5-1
Diffstat (limited to 'spec')
-rw-r--r-- | spec/services/ci/create_pipeline_service_spec.rb | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/spec/services/ci/create_pipeline_service_spec.rb b/spec/services/ci/create_pipeline_service_spec.rb index ab3c8a34783..4ba3dada37c 100644 --- a/spec/services/ci/create_pipeline_service_spec.rb +++ b/spec/services/ci/create_pipeline_service_spec.rb @@ -413,14 +413,12 @@ describe Ci::CreatePipelineService do end context 'when trigger belongs to a developer' do - let(:user) { trigger_request.trigger.owner } + let(:user) { create(:user) } + let(:trigger) { create(:ci_trigger, owner: user) } + let(:trigger_request) { create(:ci_trigger_request, trigger: trigger) } - let(:trigger_request) do - create(:ci_trigger_request).tap do |request| - user = create(:user) - project.add_developer(user) - request.trigger.update(owner: user) - end + before do + project.add_developer(user) end it 'does not create a pipeline' do @@ -431,14 +429,12 @@ describe Ci::CreatePipelineService do end context 'when trigger belongs to a master' do - let(:user) { trigger_request.trigger.owner } + let(:user) { create(:user) } + let(:trigger) { create(:ci_trigger, owner: user) } + let(:trigger_request) { create(:ci_trigger_request, trigger: trigger) } - let(:trigger_request) do - create(:ci_trigger_request).tap do |request| - user = create(:user) - project.add_master(user) - request.trigger.update(owner: user) - end + before do + project.add_master(user) end it 'creates a pipeline' do |