Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-03-26 15:36:51 +0300
committerKamil Trzciński <ayufan@ayufan.eu>2018-03-26 15:36:51 +0300
commit1de22c672e3238011e9f3d618484424805fe8437 (patch)
tree9e552989b2df6c5301361460c71fb3d554c98a22 /spec/support
parent5523ae4915babfd2a66211f76d3285439d38d4f2 (diff)
parent05103f080cf0e40b8fe5e1774b8dd1f8084105e3 (diff)
Merge branch '43316-controller-parameters-handling-sensitive-information-should-use-a-more-specific-name' into 'master'
Resolve "Controller parameters handling sensitive information should use a more specific name" Closes #43316 See merge request gitlab-org/gitlab-ce!17796
Diffstat (limited to 'spec/support')
-rw-r--r--spec/support/shared_examples/controllers/variables_shared_examples.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/support/shared_examples/controllers/variables_shared_examples.rb b/spec/support/shared_examples/controllers/variables_shared_examples.rb
index d7acf8c0032..b615a8f54cf 100644
--- a/spec/support/shared_examples/controllers/variables_shared_examples.rb
+++ b/spec/support/shared_examples/controllers/variables_shared_examples.rb
@@ -16,19 +16,19 @@ shared_examples 'PATCH #update updates variables' do
let(:variable_attributes) do
{ id: variable.id,
key: variable.key,
- value: variable.value,
+ secret_value: variable.value,
protected: variable.protected?.to_s }
end
let(:new_variable_attributes) do
{ key: 'new_key',
- value: 'dummy_value',
+ secret_value: 'dummy_value',
protected: 'false' }
end
context 'with invalid new variable parameters' do
let(:variables_attributes) do
[
- variable_attributes.merge(value: 'other_value'),
+ variable_attributes.merge(secret_value: 'other_value'),
new_variable_attributes.merge(key: '...?')
]
end
@@ -52,7 +52,7 @@ shared_examples 'PATCH #update updates variables' do
let(:variables_attributes) do
[
new_variable_attributes,
- new_variable_attributes.merge(value: 'other_value')
+ new_variable_attributes.merge(secret_value: 'other_value')
]
end
@@ -74,7 +74,7 @@ shared_examples 'PATCH #update updates variables' do
context 'with valid new variable parameters' do
let(:variables_attributes) do
[
- variable_attributes.merge(value: 'other_value'),
+ variable_attributes.merge(secret_value: 'other_value'),
new_variable_attributes
]
end