Commit f1986b21 authored by jhampton's avatar jhampton

Merge branch '20422-hide-ui-variables-by-default' of...

Merge branch '20422-hide-ui-variables-by-default' of https://gitlab.com/gitlab-org/gitlab-ce into 20422-hide-ui-variables-by-default
parents 43286857 a306cb5b
...@@ -344,16 +344,18 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do ...@@ -344,16 +344,18 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
end end
end end
describe 'Pipeline trigger variables when user is not a maintainer' do describe 'Variables' do
let(:trigger_request) { create(:ci_trigger_request) } let(:trigger_request) { create(:ci_trigger_request) }
let(:job) { create(:ci_build, pipeline: pipeline, trigger_request: trigger_request) } let(:job) { create(:ci_build, pipeline: pipeline, trigger_request: trigger_request) }
shared_examples 'expected variables behavior' do context 'when user is a maintainer' do
shared_examples 'no reveal button variables behavior' do
it 'renders a hidden value with no reveal values button', :js do it 'renders a hidden value with no reveal values button', :js do
expect(page).to have_content('Token') expect(page).to have_content('Token')
expect(page).to have_content('Variables') expect(page).to have_content('Variables')
expect(page).not_to have_css('.js-reveal-variables') expect(page).not_to have_css('.js-reveal-variables')
expect(page).to have_selector('.js-build-variable', text: 'TRIGGER_KEY_1') expect(page).to have_selector('.js-build-variable', text: 'TRIGGER_KEY_1')
expect(page).to have_selector('.js-build-value', text: '••••••') expect(page).to have_selector('.js-build-value', text: '••••••')
end end
...@@ -366,7 +368,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do ...@@ -366,7 +368,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
visit project_job_path(project, job) visit project_job_path(project, job)
end end
it_behaves_like 'expected variables behavior' it_behaves_like 'no reveal button variables behavior'
end end
context 'when variables are stored in pipeline_variables' do context 'when variables are stored in pipeline_variables' do
...@@ -376,20 +378,22 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do ...@@ -376,20 +378,22 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
visit project_job_path(project, job) visit project_job_path(project, job)
end end
it_behaves_like 'expected variables behavior' it_behaves_like 'no reveal button variables behavior'
end end
end end
describe 'Pipeline trigger variables when user is a maintainer' do context 'when user is a maintainer' do
let(:trigger_request) { create(:ci_trigger_request) } before do
project.add_maintainer(user)
let(:job) { create(:ci_build, pipeline: pipeline, trigger_request: trigger_request) } end
shared_examples 'expected variables behavior when maintainer' do shared_examples 'reveal button variables behavior' do
it 'renders a hidden value with a reveal values button', :js do it 'renders a hidden value with a reveal values button', :js do
expect(page).to have_content('Token') expect(page).to have_content('Token')
expect(page).to have_content('Variables') expect(page).to have_content('Variables')
expect(page).to have_css('.js-reveal-variables') expect(page).to have_css('.js-reveal-variables')
expect(page).to have_selector('.js-build-variable', text: 'TRIGGER_KEY_1') expect(page).to have_selector('.js-build-variable', text: 'TRIGGER_KEY_1')
expect(page).to have_selector('.js-build-value', text: '••••••') expect(page).to have_selector('.js-build-value', text: '••••••')
end end
...@@ -404,26 +408,23 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do ...@@ -404,26 +408,23 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
context 'when variables are stored in trigger_request' do context 'when variables are stored in trigger_request' do
before do before do
project.add_maintainer(user)
trigger_request.update_attribute(:variables, { 'TRIGGER_KEY_1' => 'TRIGGER_VALUE_1' } ) trigger_request.update_attribute(:variables, { 'TRIGGER_KEY_1' => 'TRIGGER_VALUE_1' } )
visit project_job_path(project, job) visit project_job_path(project, job)
end end
it_behaves_like 'expected variables behavior when maintainer' it_behaves_like 'reveal button variables behavior'
end end
context 'when variables are stored in pipeline_variables' do context 'when variables are stored in pipeline_variables' do
before do before do
project.add_maintainer(user)
create(:ci_pipeline_variable, pipeline: pipeline, key: 'TRIGGER_KEY_1', value: 'TRIGGER_VALUE_1') create(:ci_pipeline_variable, pipeline: pipeline, key: 'TRIGGER_KEY_1', value: 'TRIGGER_VALUE_1')
visit project_job_path(project, job) visit project_job_path(project, job)
end end
it_behaves_like 'expected variables behavior when maintainer' it_behaves_like 'reveal button variables behavior'
end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment