diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-24 06:09:38 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-24 06:09:38 +0300 |
| commit | 3ff77f7f70cea745600379a6d434b3aafa12de01 (patch) | |
| tree | 00898538e0459f2d0c20dbba722a5868f9294f5c /spec/initializers/secret_token_spec.rb | |
| parent | cbb3bdad0677b0d7f6bf51b26be56a1bd049d0b1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/initializers/secret_token_spec.rb')
| -rw-r--r-- | spec/initializers/secret_token_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/initializers/secret_token_spec.rb b/spec/initializers/secret_token_spec.rb index ab16dbad3fc..2c396a18361 100644 --- a/spec/initializers/secret_token_spec.rb +++ b/spec/initializers/secret_token_spec.rb @@ -84,7 +84,7 @@ RSpec.describe 'create_tokens' do it 'writes the secrets to secrets.yml' do expect(File).to receive(:write).with('config/secrets.yml', any_args) do |filename, contents, options| - new_secrets = YAML.load(contents)[Rails.env] + new_secrets = YAML.safe_load(contents)[Rails.env] expect(new_secrets['secret_key_base']).to eq(secrets.secret_key_base) expect(new_secrets['otp_key_base']).to eq(secrets.otp_key_base) @@ -179,7 +179,7 @@ RSpec.describe 'create_tokens' do it 'uses the file secret' do expect(File).to receive(:write) do |filename, contents, options| - new_secrets = YAML.load(contents)[Rails.env] + new_secrets = YAML.safe_load(contents)[Rails.env] expect(new_secrets['secret_key_base']).to eq('file_key') expect(new_secrets['otp_key_base']).to eq('file_key') |