summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorKamil TrzciƄski <ayufan@ayufan.eu>2017-09-13 12:39:43 +0000
committerSimon Knox <psimyn@gmail.com>2017-09-13 23:07:50 +1000
commit46395b78caab1f79ea7014e1266d7a76b79a57ac (patch)
treef87d9279ea43f4959a1b34331690d8206c984e97 /spec
parent4c123ee760645ffd0fce15cb1fc97a6ee8c93cf8 (diff)
downloadgitlab-ce-46395b78caab1f79ea7014e1266d7a76b79a57ac.tar.gz
Merge branch 'fix/sm/37559-pipeline-triggered-through-api-not-showing-trigger-variables' into 'master'
Fix `ci_builds` to have an associated `trigger_request_id` See merge request !14244
Diffstat (limited to 'spec')
-rw-r--r--spec/services/ci/pipeline_trigger_service_spec.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/services/ci/pipeline_trigger_service_spec.rb b/spec/services/ci/pipeline_trigger_service_spec.rb
index 9a6875e448c..f4ff818c479 100644
--- a/spec/services/ci/pipeline_trigger_service_spec.rb
+++ b/spec/services/ci/pipeline_trigger_service_spec.rb
@@ -34,6 +34,8 @@ describe Ci::PipelineTriggerService do
expect(result[:pipeline].ref).to eq('master')
expect(result[:pipeline].project).to eq(project)
expect(result[:pipeline].user).to eq(trigger.owner)
+ expect(result[:pipeline].trigger_requests.to_a)
+ .to eq(result[:pipeline].builds.map(&:trigger_request).uniq)
expect(result[:status]).to eq(:success)
end