Fix tests

Author: ekohl

spec/classes/letsencrypt_spec.rb

@@ -15,7 +15,7 @@
         describe 'with defaults' do
           it { is_expected.to compile }
 
-          epel = facts[:osfamily] == 'RedHat'
+          epel = facts[:osfamily] == 'RedHat' && facts[:operatingsystem] != 'Fedora'
 
           it 'contains File[/usr/local/sbin/letsencrypt-domain-validation]' do
             is_expected.to contain_file('/usr/local/sbin/letsencrypt-domain-validation').
@@ -46,8 +46,7 @@
                    cron_monthday: ['*'])
             is_expected.to contain_cron('letsencrypt-renew').with_ensure('absent')
 
-            case facts[:operatingsystem]
-            when 'FreeBSD'
+            if facts[:osfamily] == 'FreeBSD'
               is_expected.to contain_ini_setting('/usr/local/etc/letsencrypt/cli.ini email [email protected]')
               is_expected.to contain_ini_setting('/usr/local/etc/letsencrypt/cli.ini server https://acme-v01.api.letsencrypt.org/directory')
               is_expected.to contain_file('letsencrypt-renewal-hooks-puppet').
@@ -64,8 +63,12 @@
               is_expected.to contain_file('letsencrypt-renewal-hooks-puppet').with_path('/etc/letsencrypt/renewal-hooks-puppet')
             end
 
-            if facts[:osfamily] == 'RedHat' && facts[:operatingsystemmajrelease] == '7'
-              is_expected.to contain_class('epel').that_comes_before('Package[letsencrypt]')
+            if facts[:osfamily] == 'RedHat'
+              if facts[:operatingsystem] == 'Fedora'
+                is_expected.not_to contain_class('epel')
+              else
+                is_expected.to contain_class('epel').that_comes_before('Package[letsencrypt]')
+              end
               is_expected.to contain_class('letsencrypt::install').with(install_method: 'package')
               is_expected.to contain_class('letsencrypt').with(package_command: 'certbot')
               is_expected.to contain_package('letsencrypt').with(name: 'certbot')

spec/defines/letsencrypt_certonly_spec.rb

@@ -23,16 +23,15 @@
         it { is_expected.to contain_class('Letsencrypt::Config') }
         it { is_expected.to contain_class('Letsencrypt::Params') }
 
-        case facts[:kernel]
-        when 'Linux'
+        if facts[:osfamily] == 'FreeBSD'
+          it { is_expected.to contain_file('/usr/local/etc/letsencrypt') }
+          it { is_expected.to contain_ini_setting('/usr/local/etc/letsencrypt/cli.ini email [email protected]') }
+          it { is_expected.to contain_ini_setting('/usr/local/etc/letsencrypt/cli.ini server https://acme-v01.api.letsencrypt.org/directory') }
+        else
           it { is_expected.to contain_file('/etc/letsencrypt') }
           it { is_expected.to contain_package('letsencrypt') } unless facts[:os]['release']['full'] == '14.04'
           it { is_expected.to contain_ini_setting('/etc/letsencrypt/cli.ini email [email protected]') }
           it { is_expected.to contain_ini_setting('/etc/letsencrypt/cli.ini server https://acme-v01.api.letsencrypt.org/directory') }
-        else
-          it { is_expected.to contain_file('/usr/local/etc/letsencrypt') }
-          it { is_expected.to contain_ini_setting('/usr/local/etc/letsencrypt/cli.ini email [email protected]') }
-          it { is_expected.to contain_ini_setting('/usr/local/etc/letsencrypt/cli.ini server https://acme-v01.api.letsencrypt.org/directory') }
         end
         it { is_expected.to contain_exec('initialize letsencrypt') }
         it { is_expected.to contain_exec('letsencrypt certonly foo.example.com') }