From 51a61e53b2b6bc4d6224332a01848f80699d4b28 Mon Sep 17 00:00:00 2001 From: jhampton Date: Thu, 6 Dec 2018 08:08:02 -0500 Subject: Fixes broken tests - Adjusts behavior to cover conditional trigger variable values --- spec/controllers/projects/jobs_controller_spec.rb | 19 +++++++++++++++++++ spec/features/projects/jobs_spec.rb | 1 - 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/spec/controllers/projects/jobs_controller_spec.rb b/spec/controllers/projects/jobs_controller_spec.rb index da3d658d061..8fd8af9360c 100644 --- a/spec/controllers/projects/jobs_controller_spec.rb +++ b/spec/controllers/projects/jobs_controller_spec.rb @@ -400,6 +400,7 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do context 'with variables' do before do + project.add_maintainer(user) create(:ci_pipeline_variable, pipeline: pipeline, key: :TRIGGER_KEY_1, value: 'TRIGGER_VALUE_1') get_show(id: job.id, format: :json) @@ -415,6 +416,24 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do expect(json_response['trigger']['variables'].first['public']).to eq false end end + + context 'with no variable values' do + before do + create(:ci_pipeline_variable, pipeline: pipeline, key: :TRIGGER_KEY_1, value: 'TRIGGER_VALUE_1') + + get_show(id: job.id, format: :json) + end + + it 'exposes trigger information and variables' do + expect(response).to have_gitlab_http_status(:ok) + expect(response).to match_response_schema('job/job_details') + expect(json_response['trigger']['short_token']).to eq 'toke' + expect(json_response['trigger']['variables'].length).to eq 1 + expect(json_response['trigger']['variables'].first['key']).to eq "TRIGGER_KEY_1" + expect(json_response['trigger']['variables'].first['value']).to be_nil + expect(json_response['trigger']['variables'].first['public']).to eq false + end + end end def get_show(**extra_params) diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb index 0fb53a33b14..cda59540d59 100644 --- a/spec/features/projects/jobs_spec.rb +++ b/spec/features/projects/jobs_spec.rb @@ -354,7 +354,6 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do create(:ci_build, pipeline: pipeline, trigger_request: trigger_request) end - shared_examples 'job with outdated deployment' do it 'shows a link for the job' do expect(page).to have_content('Token') -- cgit v1.2.1