(classes) update tests

Author: dtapiacl

spec/acceptance/openvpn_spec.rb

@@ -15,6 +15,8 @@
             organization => 'FOO',
             email        => '[email protected]',
             server       => '10.0.0.0 255.255.255.0',
+            package_name => 'openvpn',
+            service_name => 'openvpn',
           }
           PUPPET
         end
@@ -61,10 +63,14 @@
               organization => 'FOO',
               email        => '[email protected]',
               server       => '10.0.0.0 255.255.255.0',
+              package_name => 'openvpn',
+              service_name => 'openvpn',
             }
-            openvpn::client { ['vpnclienta','vpnclientb'] :
-              server      => 'test_openvpn_server',
-              require     => Openvpn::Server['test_openvpn_server'],
+            openvpn::client { ['vpnclienta','vpnclientb']:
+              server       => 'test_openvpn_server',
+              require      => Openvpn::Server['test_openvpn_server'],
+              package_name => 'openvpn',
+              service_name => 'openvpn',
             }
         PUPPET
       end
@@ -92,13 +98,19 @@
             organization => 'FOO',
             email        => '[email protected]',
             server       => '10.0.0.0 255.255.255.0',
+            package_name => 'openvpn',
+            service_name => 'openvpn',
           }
-          openvpn::client { ['vpnclienta','vpnclientb'] :
-            server      => 'test_openvpn_server',
-            require     => Openvpn::Server['test_openvpn_server'],
+          openvpn::client { ['vpnclienta','vpnclientb']:
+            server       => 'test_openvpn_server',
+            require      => Openvpn::Server['test_openvpn_server'],
+            package_name => 'openvpn',
+            service_name => 'openvpn',
           }
           openvpn::revoke { 'vpnclientb':
-            server => 'test_openvpn_server',
+            server       => 'test_openvpn_server',
+            package_name => 'openvpn',
+            service_name => 'openvpn',
           }
       PUPPET
       # Apply the manifest to revoke the client certificate

spec/classes/openvpn_init_spec.rb

@@ -16,18 +16,7 @@
       it { is_expected.to create_class('openvpn') }
       it { is_expected.to contain_class('openvpn::install') }
       it { is_expected.to contain_class('openvpn::config') }
-
-      if os_facts[:service_provider] == 'systemd'
-        context 'system with systemd' do
-          it { is_expected.to create_class('openvpn') }
-          it { is_expected.not_to contain_class('openvpn::service') }
-        end
-      else
-        context 'system without systemd' do
-          it { is_expected.to create_class('openvpn') }
-          it { is_expected.to contain_class('openvpn::service') }
-        end
-      end
+      it { is_expected.to contain_class('openvpn::service') } # always included now
     end
   end
 end

spec/classes/openvpn_install_spec.rb

@@ -2,15 +2,14 @@
 
 require 'spec_helper'
 
-describe 'openvpn::install' do
+describe 'openvpn' do
   on_supported_os.each do |os, os_facts|
     context "on #{os}" do
       let(:facts) do
         os_facts.merge(
           easyrsa: '3.0'
         )
       end
-      let(:pre_condition) { 'include openvpn' }
 
       etc_directory = case os_facts[:os]['family']
                       when 'Solaris'
@@ -23,23 +22,36 @@
 
       it { is_expected.to compile.with_all_deps }
 
-      it { is_expected.to create_class('openvpn::install') }
+      it { is_expected.to contain_class('openvpn::install') }
 
-      it { is_expected.to contain_package('openvpn') }
+      # Default package
+      it { is_expected.to contain_package('openvpn').with_ensure(%r{present|installed}) }
 
+      # Directories
       it { is_expected.to contain_file("#{etc_directory}/openvpn").with_ensure('directory') }
-
       it { is_expected.to contain_file("#{etc_directory}/openvpn/keys").with_ensure('directory') }
-
       it { is_expected.to contain_file('/var/log/openvpn').with_ensure('directory') }
 
+      # Additional packages
       it { is_expected.to contain_package('easy-rsa') }
 
       if os_facts[:os]['family'] == 'Debian'
         it { is_expected.to contain_package('openvpn-auth-ldap') }
       else
         it { is_expected.not_to contain_package('openvpn-auth-ldap') }
       end
+
+      # Override package_name and package_ensure
+      context 'with overridden package_name and package_ensure' do
+        let(:params) do
+          {
+            package_name: 'openvpn-as',
+            package_ensure: 'latest',
+          }
+        end
+
+        it { is_expected.to contain_package('openvpn-as').with_ensure('latest') }
+      end
     end
   end
 end

spec/classes/openvpn_service_spec.rb

@@ -2,54 +2,62 @@
 
 require 'spec_helper'
 
-describe 'openvpn::service' do
+describe 'openvpn' do
   on_supported_os.each do |os, os_facts|
     context "on #{os}" do
-      let(:facts) do
-        os_facts.merge(
-          easyrsa: '3.0'
-        )
-      end
-      let(:pre_condition) { 'include openvpn' }
-
-      it { is_expected.to compile.with_all_deps }
+      let(:facts) { os_facts.merge(easyrsa: '3.0') }
 
-      context 'enabled manage_service and disabled namespecific_rclink' do
-        let(:pre_condition) do
-          'class { "openvpn":
-            manage_service => true,
-            namespecific_rclink => false
-          }'
+      context 'with manage_service => true and namespecific_rclink => false' do
+        let(:params) do
+          {
+            manage_service: true,
+            namespecific_rclink: false,
+          }
         end
 
-        it { is_expected.to create_class('openvpn::service') }
+        it { is_expected.to contain_class('openvpn::service') }
 
-        it { is_expected.to contain_service('openvpn').with_ensure('running').with_enable(true) }
+        it {
+          is_expected.to contain_service('openvpn').with(
+            ensure: 'running',
+            enable: true
+          )
+        }
       end
 
-      context 'disabled manage_service and disabled namespecific_rclink' do
-        let(:pre_condition) do
-          'class { "openvpn":
-            manage_service => false,
-            namespecific_rclink => false
-          }'
+      context 'with manage_service => false and namespecific_rclink => false' do
+        let(:params) do
+          {
+            manage_service: false,
+            namespecific_rclink: false,
+          }
         end
 
-        it { is_expected.to create_class('openvpn::service') }
-
+        it { is_expected.to contain_class('openvpn::service') }
         it { is_expected.not_to contain_service('openvpn') }
       end
 
-      context 'disabled manage_service and enabled namespecific_rclink' do
-        let(:pre_condition) do
-          'class { "openvpn":
-            manage_service => false,
-            namespecific_rclink => true
-          }'
+      context 'with manage_service => true and namespecific_rclink => true' do
+        let(:params) do
+          {
+            manage_service: true,
+            namespecific_rclink: true,
+          }
         end
 
-        it { is_expected.to create_class('openvpn::service') }
+        it { is_expected.to contain_class('openvpn::service') }
+        it { is_expected.not_to contain_service('openvpn') }
+      end
+
+      context 'with manage_service => false and namespecific_rclink => true' do
+        let(:params) do
+          {
+            manage_service: false,
+            namespecific_rclink: true,
+          }
+        end
 
+        it { is_expected.to contain_class('openvpn::service') }
         it { is_expected.not_to contain_service('openvpn') }
       end
     end