diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
commit | 9f46488805e86b1bc341ea1620b866016c2ce5ed (patch) | |
tree | f9748c7e287041e37d6da49e0a29c9511dc34768 /spec/config/application_spec.rb | |
parent | dfc92d081ea0332d69c8aca2f0e745cb48ae5e6d (diff) | |
download | gitlab-ce-9f46488805e86b1bc341ea1620b866016c2ce5ed.tar.gz |
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'spec/config/application_spec.rb')
-rw-r--r-- | spec/config/application_spec.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/config/application_spec.rb b/spec/config/application_spec.rb index 994cea4c84f..e6b8da690a2 100644 --- a/spec/config/application_spec.rb +++ b/spec/config/application_spec.rb @@ -5,7 +5,7 @@ require 'spec_helper' describe Gitlab::Application do # rubocop:disable RSpec/FilePath using RSpec::Parameterized::TableSyntax - FILTERED_PARAM = ActiveSupport::ParameterFilter::FILTERED + filtered_param = ActiveSupport::ParameterFilter::FILTERED context 'when parameters are logged' do describe 'rails does not leak confidential parameters' do @@ -19,11 +19,11 @@ describe Gitlab::Application do # rubocop:disable RSpec/FilePath where(:input_url, :output_query) do '/' | {} '/?safe=1' | { 'safe' => '1' } - '/?private_token=secret' | { 'private_token' => FILTERED_PARAM } - '/?mixed=1&private_token=secret' | { 'mixed' => '1', 'private_token' => FILTERED_PARAM } - '/?note=secret¬eable=1&prefix_note=2' | { 'note' => FILTERED_PARAM, 'noteable' => '1', 'prefix_note' => '2' } - '/?note[note]=secret&target_type=1' | { 'note' => FILTERED_PARAM, 'target_type' => '1' } - '/?safe[note]=secret&target_type=1' | { 'safe' => { 'note' => FILTERED_PARAM }, 'target_type' => '1' } + '/?private_token=secret' | { 'private_token' => filtered_param } + '/?mixed=1&private_token=secret' | { 'mixed' => '1', 'private_token' => filtered_param } + '/?note=secret¬eable=1&prefix_note=2' | { 'note' => filtered_param, 'noteable' => '1', 'prefix_note' => '2' } + '/?note[note]=secret&target_type=1' | { 'note' => filtered_param, 'target_type' => '1' } + '/?safe[note]=secret&target_type=1' | { 'safe' => { 'note' => filtered_param }, 'target_type' => '1' } end with_them do |