diff options
author | Shinya Maeda <shinya@gitlab.com> | 2017-07-24 20:18:50 +0900 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2017-07-25 14:42:08 +0900 |
commit | bd7b7def5e0c8d46d639328cc2f1e35edf26b35e (patch) | |
tree | f4316289bfaaad8693a5cd21df218c565730c5b4 | |
parent | 4b1827afefe48372303e4c1f09408723191e47f7 (diff) | |
download | gitlab-ce-bd7b7def5e0c8d46d639328cc2f1e35edf26b35e.tar.gz |
Fix spec
-rw-r--r-- | app/services/ci/pipeline_trigger_service.rb | 2 | ||||
-rw-r--r-- | spec/services/ci/pipeline_trigger_service_spec.rb | 18 |
2 files changed, 4 insertions, 16 deletions
diff --git a/app/services/ci/pipeline_trigger_service.rb b/app/services/ci/pipeline_trigger_service.rb index 80ca5add7ba..05da2f2c37d 100644 --- a/app/services/ci/pipeline_trigger_service.rb +++ b/app/services/ci/pipeline_trigger_service.rb @@ -31,7 +31,7 @@ module Ci end def create_pipeline_variables!(pipeline) - return if params[:variables] == nil || params[:variables].length == 0 + return if params[:variables].is_a?(Hash) variables = params[:variables].map do |key, value| { key: key, value: value } diff --git a/spec/services/ci/pipeline_trigger_service_spec.rb b/spec/services/ci/pipeline_trigger_service_spec.rb index 4532a0ce07f..914ec4844d0 100644 --- a/spec/services/ci/pipeline_trigger_service_spec.rb +++ b/spec/services/ci/pipeline_trigger_service_spec.rb @@ -32,24 +32,12 @@ describe Ci::PipelineTriggerService, services: true do end context 'when params have a variable' do - let(:variables) { [{ key: 'AAA', value: 'AAA123' }] } + let(:variables) { { 'AAA' => 'AAA123' } } it 'has a variable' do expect { result }.to change { Ci::PipelineVariable.count }.by(1) - expect(result[:pipeline].variables.first.key).to eq(variables.first[:key]) - expect(result[:pipeline].variables.first.value).to eq(variables.first[:value]) - end - end - - context 'when params have two variables' do - let(:variables) { [{ key: 'AAA', value: 'AAA123' }, { key: 'BBB', value: 'BBB123' }] } - - it 'has two variables' do - expect { result }.to change { Ci::PipelineVariable.count }.by(2) - expect(result[:pipeline].variables.first.key).to eq(variables.first[:key]) - expect(result[:pipeline].variables.first.value).to eq(variables.first[:value]) - expect(result[:pipeline].variables.last.key).to eq(variables.last[:key]) - expect(result[:pipeline].variables.last.value).to eq(variables.last[:value]) + expect(result[:pipeline].variables.first.key).to eq(variables.keys.first) + expect(result[:pipeline].variables.first.value).to eq(variables.values.first) end end |