Clean up manifest_vars handling in specs

voxpupuli · Nov 28, 2019 · b06a186 · b06a186
1 parent 74117e5
commit b06a186
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 22 deletions.
diff --git a/spec/classes/redis_spec.rb b/spec/classes/redis_spec.rb
@@ -434,9 +434,7 @@
         let(:params) { { manage_repo: true } }
 
         case facts[:operatingsystem]
-
         when 'Debian'
-
           context 'on Debian' do
             it do
               is_expected.to create_apt__source('dotdeb').with(location: 'http://packages.dotdeb.org/',
@@ -448,17 +446,10 @@
                                                                include: { 'src' => true })
             end
           end
-
         when 'Ubuntu'
-
-          let(:ppa_repo) { manifest_vars[:ppa_repo] }
-
-          it { is_expected.to contain_apt__ppa(ppa_repo) }
-
+          it { is_expected.to contain_apt__ppa('ppa:chris-lea/redis-server') }
         when 'RedHat', 'CentOS', 'Scientific', 'OEL', 'Amazon'
-
           it { is_expected.to contain_class('epel') }
-
         end
       end
 
@@ -609,8 +600,6 @@
           }
         end
 
-        let(:service_name) { manifest_vars[:service_name] }
-
         it { is_expected.to contain_file(config_file_orig).that_notifies("Service[#{service_name}]") }
       end
 
@@ -630,7 +619,6 @@
 
       describe 'with parameter: package_ensure' do
         let(:params) { { package_ensure: '_VALUE_' } }
-        let(:package_name) { manifest_vars[:package_name] }
 
         it {
           is_expected.to contain_package(package_name).with(
@@ -908,21 +896,18 @@
 
       describe 'with parameter: service_manage (set to false)' do
         let(:params) { { service_manage: false } }
-        let(:package_name) { manifest_vars[:package_name] }
 
         it { is_expected.not_to contain_service(package_name) }
       end
 
       describe 'with parameter: service_enable' do
         let(:params) { { service_enable: true } }
-        let(:package_name) { manifest_vars[:package_name] }
 
         it { is_expected.to contain_service(package_name).with_enable(true) }
       end
 
       describe 'with parameter: service_ensure' do
         let(:params) { { service_ensure: 'stopped' } }
-        let(:package_name) { manifest_vars[:package_name] }
 
         it { is_expected.to contain_service(package_name).with_ensure('stopped') }
       end
@@ -935,14 +920,12 @@
 
       describe 'with parameter: service_hasrestart' do
         let(:params) { { service_hasrestart: true } }
-        let(:package_name) { manifest_vars[:package_name] }
 
         it { is_expected.to contain_service(package_name).with_hasrestart(true) }
       end
 
       describe 'with parameter: service_hasstatus' do
         let(:params) { { service_hasstatus: true } }
-        let(:package_name) { manifest_vars[:package_name] }
 
         it { is_expected.to contain_service(package_name).with_hasstatus(true) }
       end

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -15,25 +15,21 @@ def manifest_vars
     vars[:service_name] = 'redis'
     vars[:config_file] = '/etc/redis.conf'
     vars[:config_file_orig] = '/etc/redis.conf.puppet'
-    vars[:ppa_repo] = nil
   when 'FreeBSD',
     vars[:package_name] = 'redis'
     vars[:service_name] = 'redis'
     vars[:config_file] = '/usr/local/etc/redis.conf'
     vars[:config_file_orig] = '/usr/local/etc/redis.conf.puppet'
-    vars[:ppa_repo] = nil
   when 'Debian'
     vars[:package_name] = 'redis-server'
     vars[:service_name] = 'redis-server'
     vars[:config_file] = '/etc/redis/redis.conf'
     vars[:config_file_orig] = '/etc/redis/redis.conf.puppet'
-    vars[:ppa_repo] = 'ppa:chris-lea/redis-server'
   when 'Archlinux'
     vars[:package_name] = 'redis'
     vars[:service_name] = 'redis'
     vars[:config_file] = '/etc/redis/redis.conf'
     vars[:config_file_orig] = '/etc/redis/redis.conf.puppet'
-    vars[:ppa_repo] = nil
   end
 
   vars