diff options
author | Bob Van Landuyt <bob@gitlab.com> | 2019-05-23 14:53:10 +0000 |
---|---|---|
committer | Bob Van Landuyt <bob@gitlab.com> | 2019-05-23 14:53:10 +0000 |
commit | 671fadf1ab604daa0caf61944a9a152836dffecb (patch) | |
tree | 66366bec274cff0e8a9fa37dd049a91bc06a0be8 /spec/requests | |
parent | 17971f86a4041e42e650de3b2de78128a2096d5c (diff) | |
parent | 00c851384e8bc957f601d27c25c36c2ca80b60c1 (diff) | |
download | gitlab-ce-671fadf1ab604daa0caf61944a9a152836dffecb.tar.gz |
Merge branch 'api_masked_variables' into 'master'
API: Allow to get and set "masked" attribute for variables
Closes #61754
See merge request gitlab-org/gitlab-ce!28381
Diffstat (limited to 'spec/requests')
-rw-r--r-- | spec/requests/api/variables_spec.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/spec/requests/api/variables_spec.rb b/spec/requests/api/variables_spec.rb index cc07869a744..55b1419a004 100644 --- a/spec/requests/api/variables_spec.rb +++ b/spec/requests/api/variables_spec.rb @@ -43,6 +43,7 @@ describe API::Variables do expect(response).to have_gitlab_http_status(200) expect(json_response['value']).to eq(variable.value) expect(json_response['protected']).to eq(variable.protected?) + expect(json_response['masked']).to eq(variable.masked?) expect(json_response['variable_type']).to eq('env_var') end @@ -74,13 +75,14 @@ describe API::Variables do context 'authorized user with proper permissions' do it 'creates variable' do expect do - post api("/projects/#{project.id}/variables", user), params: { key: 'TEST_VARIABLE_2', value: 'PROTECTED_VALUE_2', protected: true } + post api("/projects/#{project.id}/variables", user), params: { key: 'TEST_VARIABLE_2', value: 'PROTECTED_VALUE_2', protected: true, masked: true } end.to change {project.variables.count}.by(1) expect(response).to have_gitlab_http_status(201) expect(json_response['key']).to eq('TEST_VARIABLE_2') expect(json_response['value']).to eq('PROTECTED_VALUE_2') expect(json_response['protected']).to be_truthy + expect(json_response['masked']).to be_truthy expect(json_response['variable_type']).to eq('env_var') end @@ -93,6 +95,7 @@ describe API::Variables do expect(json_response['key']).to eq('TEST_VARIABLE_2') expect(json_response['value']).to eq('VALUE_2') expect(json_response['protected']).to be_falsey + expect(json_response['masked']).to be_falsey expect(json_response['variable_type']).to eq('file') end |