Merge pull request thias#51 from NexusIS/master

Add missing bind tools package and improve rspec tests
anarcat · Jul 11, 2015 · c178d73 · c178d73
2 parents aeffbe2 + 0479c58
commit c178d73
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 15 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -24,6 +24,12 @@
         notify  => Service['bind'],
     }
 
+    package{'bind-tools':
+        ensure => latest,
+        name   => $::bind::params::nsupdate_package,
+        before => Package['bind'],
+    }
+
     package { 'bind':
         ensure => latest,
         name   => $::bind::params::bind_package,

diff --git a/spec/classes/bind_spec.rb b/spec/classes/bind_spec.rb
@@ -2,23 +2,66 @@
 require 'spec_helper'
 
 describe 'bind' do
-  let(:facts) { { :concat_basedir => '/wtf' } }
+  context "on a Debian OS" do
+    let :facts do
+      {
+        :concat_basedir  => '/wtf',
+        :osfamily        => 'Debian',
+        :operatingsystem => 'Debian'
+      }
+    end
+    it {
+      should contain_package('bind-tools').with({
+        'ensure' => 'latest',
+        'name'   => 'dnsutils'
+      }).that_comes_before('Package[bind]')
+    }
+    it {
+      should contain_package('bind').with({
+        'ensure' => 'latest',
+        'name' => 'bind9'
+      })
+    }
 
-  it {
-    should contain_package('bind').with({
-      'ensure' => 'latest',
-      'name' => 'bind9'
-    })
-  }
+    it { should contain_file('_NAMEDCONF_').that_requires('Package[bind]') }
+    it { should contain_file('_NAMEDCONF_').that_notifies('Service[bind]') }
 
-  it { should contain_file('_NAMEDCONF_').that_requires('Package[bind]') }
-  it { should contain_file('_NAMEDCONF_').that_notifies('Service[bind]') }
+    it {
+      should contain_service('bind').with({
+        'ensure' => 'running',
+        'name' => 'bind9'
+      })
+    }
+  end
+  context "on a RedHat OS" do
+    let :facts do
+      {
+        :concat_basedir  => '/wtf',
+        :osfamily        => 'RedHat',
+        :operatingsystem => 'CentOS'
+      }
+    end
+    it {
+      should contain_package('bind-tools').with({
+        'ensure' => 'latest',
+        'name'   => 'bind-utils'
+      })
+    }
+    it {
+      should contain_package('bind').with({
+        'ensure' => 'latest',
+        'name'   => 'bind'
+      })
+    }
 
-  it {
-    should contain_service('bind').with({
-      'ensure' => 'running',
-      'name' => 'bind9'
-    })
-  }
+    it { should contain_file('_NAMEDCONF_').that_requires('Package[bind]') }
+    it { should contain_file('_NAMEDCONF_').that_notifies('Service[bind]') }
 
+    it {
+      should contain_service('bind').with({
+        'ensure' => 'running',
+        'name' => 'named'
+      })
+    }
+  end
 end