From: david22swan Date: Wed, 26 Apr 2023 16:09:00 +0000 (+0100) Subject: (CONT-773) Rubocop Manual Fix 3 - Lint/ConstantDefinitionInBlock X-Git-Tag: v9.1.0~9^2~4 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=945062184700d344111871c7cd7ac768842d253e;p=puppet-modules%2Fpuppetlabs-apt.git (CONT-773) Rubocop Manual Fix 3 - Lint/ConstantDefinitionInBlock --- diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index fb3857b..5c52997 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -6,15 +6,6 @@ # Note that changes in the inspected code, or installation of new # versions of RuboCop, may require this file to be generated again. -# Offense count: 3 -# Configuration parameters: AllowedMethods. -# AllowedMethods: enums -Lint/ConstantDefinitionInBlock: - Exclude: - - 'spec/defines/key_compat_spec.rb' - - 'spec/defines/source_compat_spec.rb' - - 'spec/defines/source_spec.rb' - # Offense count: 6 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes. Metrics/AbcSize: diff --git a/spec/defines/key_compat_spec.rb b/spec/defines/key_compat_spec.rb index 4420337..8a0972e 100644 --- a/spec/defines/key_compat_spec.rb +++ b/spec/defines/key_compat_spec.rb @@ -21,8 +21,8 @@ def apt_key_example(title) end describe 'apt::key', type: :define do - GPG_KEY_ID = '6F6B15509CF8E59E6E469F327F438280EF8D349F' - + let(:title) { '6F6B15509CF8E59E6E469F327F438280EF8D349F' } + let(:pre_condition) { 'include apt' } let(:facts) do { os: { @@ -40,14 +40,6 @@ describe 'apt::key', type: :define do } end - let :title do - GPG_KEY_ID - end - - let :pre_condition do - 'include apt' - end - describe 'normal operation' do describe 'default options' do it { @@ -70,12 +62,12 @@ describe 'apt::key', type: :define do let :params do { - id: GPG_KEY_ID + id: title } end it 'contains the apt_key' do - expect(subject).to contain_apt_key(title).with(id: GPG_KEY_ID, + expect(subject).to contain_apt_key(title).with(id: title, ensure: 'present', source: nil, server: 'keyserver.ubuntu.com', @@ -83,7 +75,7 @@ describe 'apt::key', type: :define do end it 'contains the apt_key present anchor' do - expect(subject).to contain_anchor("apt_key #{GPG_KEY_ID} present") + expect(subject).to contain_anchor("apt_key #{title} present") end end diff --git a/spec/defines/source_compat_spec.rb b/spec/defines/source_compat_spec.rb index a414c49..55be585 100644 --- a/spec/defines/source_compat_spec.rb +++ b/spec/defines/source_compat_spec.rb @@ -3,12 +3,8 @@ require 'spec_helper' describe 'apt::source', type: :define do - GPG_KEY_ID = '6F6B15509CF8E59E6E469F327F438280EF8D349F' - - let :title do - 'my_source' - end - + let(:id) { '6F6B15509CF8E59E6E469F327F438280EF8D349F' } + let(:title) { 'my_source' } let :facts do { os: { @@ -47,7 +43,7 @@ describe 'apt::source', type: :define do 'release' => 'sid', 'repos' => 'testing', 'include' => { 'src' => false }, - 'key' => GPG_KEY_ID, + 'key' => id, 'pin' => '10', 'architecture' => 'x86_64', 'allow_unsigned' => true @@ -66,8 +62,8 @@ describe 'apt::source', type: :define do } it { - expect(subject).to contain_apt__key("Add key: #{GPG_KEY_ID} from Apt::Source my_source").that_comes_before('Apt::Setting[list-my_source]').with('ensure' => 'present', - 'id' => GPG_KEY_ID) + expect(subject).to contain_apt__key("Add key: #{id} from Apt::Source my_source").that_comes_before('Apt::Setting[list-my_source]').with('ensure' => 'present', + 'id' => id) } end diff --git a/spec/defines/source_spec.rb b/spec/defines/source_spec.rb index 8cf9a45..e9c0cf2 100644 --- a/spec/defines/source_spec.rb +++ b/spec/defines/source_spec.rb @@ -3,16 +3,9 @@ require 'spec_helper' describe 'apt::source' do - GPG_KEY_ID = '6F6B15509CF8E59E6E469F327F438280EF8D349F' - - let :pre_condition do - 'class { "apt": }' - end - - let :title do - 'my_source' - end - + let(:id) { '6F6B15509CF8E59E6E469F327F438280EF8D349F' } + let(:title) { 'my_source' } + let(:pre_condition) { 'class { "apt": }' } let :facts do { os: { @@ -79,7 +72,7 @@ describe 'apt::source' do location: 'http://debian.mirror.iweb.ca/debian/', release: 'sid', repos: 'testing', - key: GPG_KEY_ID, + key: id, pin: '10', architecture: 'x86_64', allow_unsigned: true @@ -98,8 +91,8 @@ describe 'apt::source' do } it { - expect(subject).to contain_apt__key("Add key: #{GPG_KEY_ID} from Apt::Source my_source").that_comes_before('Apt::Setting[list-my_source]').with(ensure: 'present', - id: GPG_KEY_ID) + expect(subject).to contain_apt__key("Add key: #{id} from Apt::Source my_source").that_comes_before('Apt::Setting[list-my_source]').with(ensure: 'present', + id: id) } end @@ -112,7 +105,7 @@ describe 'apt::source' do repos: 'testing', key: { 'ensure' => 'refreshed', - 'id' => GPG_KEY_ID, + 'id' => id, 'server' => 'pgp.mit.edu', 'content' => 'GPG key content', 'source' => 'http://apt.puppetlabs.com/pubkey.gpg', @@ -136,12 +129,12 @@ describe 'apt::source' do } it { - expect(subject).to contain_apt__key("Add key: #{GPG_KEY_ID} from Apt::Source my_source").that_comes_before('Apt::Setting[list-my_source]').with(ensure: 'refreshed', - id: GPG_KEY_ID, - server: 'pgp.mit.edu', - content: 'GPG key content', - source: 'http://apt.puppetlabs.com/pubkey.gpg', - weak_ssl: true) + expect(subject).to contain_apt__key("Add key: #{id} from Apt::Source my_source").that_comes_before('Apt::Setting[list-my_source]').with(ensure: 'refreshed', + id: GPG_KEY_ID, + server: 'pgp.mit.edu', + content: 'GPG key content', + source: 'http://apt.puppetlabs.com/pubkey.gpg', + weak_ssl: true) } end end