diff options
author | Shinya Maeda <shinya@gitlab.com> | 2017-09-01 20:37:11 +0300 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2017-09-04 15:55:26 +0300 |
commit | 3ae2038176b27673b06a040873fdbe19c94d67d3 (patch) | |
tree | b06366ef67123713f55e462f9dd57e5a12c60c48 /spec/requests/api | |
parent | d614c431055286eaab3b82e810186ac19a2c4fd7 (diff) |
Remove ci_trigger_request_with_variables
Diffstat (limited to 'spec/requests/api')
-rw-r--r-- | spec/requests/api/runner_spec.rb | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb index 993164aa8fe..6fede7c9f75 100644 --- a/spec/requests/api/runner_spec.rb +++ b/spec/requests/api/runner_spec.rb @@ -557,17 +557,36 @@ describe API::Runner do { 'key' => 'TRIGGER_KEY_1', 'value' => 'TRIGGER_VALUE_1', 'public' => false }] end + let(:trigger) { create(:ci_trigger, project: project) } + let!(:trigger_request) { create(:ci_trigger_request, pipeline: pipeline, builds: [job], trigger: trigger) } + before do - trigger = create(:ci_trigger, project: project) - create(:ci_trigger_request_with_variables, pipeline: pipeline, builds: [job], trigger: trigger) project.variables << Ci::Variable.new(key: 'SECRET_KEY', value: 'secret_value') end - it 'returns variables for triggers' do - request_job + shared_examples 'expected variables behavior' do + it 'returns variables for triggers' do + request_job - expect(response).to have_http_status(201) - expect(json_response['variables']).to include(*expected_variables) + expect(response).to have_http_status(201) + expect(json_response['variables']).to include(*expected_variables) + end + end + + context 'when variables are stored in trigger_request' do + before do + trigger_request.update_attribute(:variables, { TRIGGER_KEY_1: 'TRIGGER_VALUE_1' } ) + end + + it_behaves_like 'expected variables behavior' + end + + context 'when variables are stored in pipeline_variables' do + before do + create(:ci_pipeline_variable, pipeline: pipeline, key: :TRIGGER_KEY_1, value: 'TRIGGER_VALUE_1') + end + + it_behaves_like 'expected variables behavior' end end |