From 2a9a01b955c1f8081d669724d8592e4cac7d5f19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Wed, 18 Apr 2018 18:42:58 +0200 Subject: [PATCH] Add variables option to Ci::CreatePipelineService --- app/services/ci/create_pipeline_service.rb | 1 + .../ci/create_pipeline_service_spec.rb | 21 +++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb index 6ce86983287..4bbda434c6c 100644 --- a/app/services/ci/create_pipeline_service.rb +++ b/app/services/ci/create_pipeline_service.rb @@ -24,6 +24,7 @@ module Ci ignore_skip_ci: ignore_skip_ci, save_incompleted: save_on_errors, seeds_block: block, + variables: params[:variables_attributes], project: project, current_user: current_user) diff --git a/spec/services/ci/create_pipeline_service_spec.rb b/spec/services/ci/create_pipeline_service_spec.rb index 267258b33a8..652603df854 100644 --- a/spec/services/ci/create_pipeline_service_spec.rb +++ b/spec/services/ci/create_pipeline_service_spec.rb @@ -17,11 +17,13 @@ describe Ci::CreatePipelineService do after: project.commit.id, message: 'Message', ref: ref_name, - trigger_request: nil) + trigger_request: nil, + variables: nil) params = { ref: ref, before: '00000000', after: after, - commits: [{ message: message }] } + commits: [{ message: message }], + variables_attributes: variables } described_class.new(project, user, params).execute( source, trigger_request: trigger_request) @@ -545,5 +547,20 @@ describe Ci::CreatePipelineService do expect(pipeline.tag?).to be true end end + + context 'when pipeline variables are specified' do + let(:variables) do + [{ key: 'first', secret_value: 'world' }, + { key: 'second', secret_value: 'second_world' }] + end + + subject { execute_service(variables: variables) } + + it 'creates a pipeline with specified variables' do + expect(subject.variables.count).to eq(variables.count) + expect(subject.variables.first.key).to eq(variables.first[:key]) + expect(subject.variables.last.secret_value).to eq(variables.last[:secret_value]) + end + end end end