summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-09-13 18:23:35 +0900
committerShinya Maeda <shinya@gitlab.com>2017-09-13 18:23:35 +0900
commit586f21060176da9324fcfe05456e236fc77d2cfa (patch)
tree1dda783722fe43bd9be07281e15eb449515a2502
parent7338800787d571475810f26d7e921d8eb0382737 (diff)
downloadgitlab-ce-fix/sm/37559-pipeline-triggered-through-api-not-showing-trigger-variables.tar.gz
-rw-r--r--changelogs/unreleased/fix-sm-37559-pipeline-triggered-through-api-not-showing-trigger-variables.yml6
-rw-r--r--spec/services/ci/pipeline_trigger_service_spec.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/changelogs/unreleased/fix-sm-37559-pipeline-triggered-through-api-not-showing-trigger-variables.yml b/changelogs/unreleased/fix-sm-37559-pipeline-triggered-through-api-not-showing-trigger-variables.yml
new file mode 100644
index 00000000000..8aae0f6f5b6
--- /dev/null
+++ b/changelogs/unreleased/fix-sm-37559-pipeline-triggered-through-api-not-showing-trigger-variables.yml
@@ -0,0 +1,6 @@
+---
+title: Fix Pipeline Triggers to show triggered label and predefined variables (e.g.
+ CI_PIPELINE_TRIGGERED)
+merge_request: 14244
+author:
+type: fixed
diff --git a/spec/services/ci/pipeline_trigger_service_spec.rb b/spec/services/ci/pipeline_trigger_service_spec.rb
index a19b54327ec..f4ff818c479 100644
--- a/spec/services/ci/pipeline_trigger_service_spec.rb
+++ b/spec/services/ci/pipeline_trigger_service_spec.rb
@@ -34,7 +34,7 @@ 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.last])
+ expect(result[:pipeline].trigger_requests.to_a)
.to eq(result[:pipeline].builds.map(&:trigger_request).uniq)
expect(result[:status]).to eq(:success)
end