diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-10 14:31:21 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-10 14:31:21 +0000 |
| commit | 133d5c1c64b9d9265736a8b6277fcd73730c6612 (patch) | |
| tree | 154c589a076088cb42588894154c1ad15c9b1c58 /spec/requests | |
| parent | 2ff359142a08af8656f5f6ed90a65e90ecec32f2 (diff) | |
| parent | 9ba0f83d25a7ae8ad8a500f706af45de9fc469b6 (diff) | |
| download | gitlab-ce-133d5c1c64b9d9265736a8b6277fcd73730c6612.tar.gz | |
Merge branch 'rename-ci-commit-phase-4' into 'master'
Rename Commit to Pipeline in TriggerRequest
Changes in TriggerRequest a `commit` to `pipeline`.
See merge request !4505
Diffstat (limited to 'spec/requests')
| -rw-r--r-- | spec/requests/ci/api/builds_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/ci/api/builds_spec.rb b/spec/requests/ci/api/builds_spec.rb index 88271642532..e8508f8f950 100644 --- a/spec/requests/ci/api/builds_spec.rb +++ b/spec/requests/ci/api/builds_spec.rb @@ -85,7 +85,7 @@ describe Ci::API::API do trigger = FactoryGirl.create(:ci_trigger, project: project) pipeline = FactoryGirl.create(:ci_pipeline, project: project, ref: 'master') - trigger_request = FactoryGirl.create(:ci_trigger_request_with_variables, commit: pipeline, trigger: trigger) + trigger_request = FactoryGirl.create(:ci_trigger_request_with_variables, pipeline: pipeline, trigger: trigger) pipeline.create_builds(nil, trigger_request) project.variables << Ci::Variable.new(key: "SECRET_KEY", value: "secret_value") |