Spec refactor

Gemfile

@@ -4,7 +4,7 @@ group :test do
   gem "rake"
   gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.4.0'
   gem "puppet-lint"
-  gem "rspec-puppet", '~> 1.0.0' 
+  gem "rspec-puppet", :git => 'https://github.com/rodjek/rspec-puppet.git'
   gem "puppet-syntax"
   gem "puppetlabs_spec_helper"
 end

Gemfile.lock

@@ -1,3 +1,10 @@
+GIT
+  remote: https://github.com/rodjek/rspec-puppet.git
+  revision: 03e94422fb9bbdd950d5a0bec6ead5d76e06616b
+  specs:
+    rspec-puppet (1.0.1)
+      rspec
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -32,8 +39,6 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    rspec-puppet (1.0.1)
-      rspec
 
 PLATFORMS
   ruby
@@ -44,4 +49,4 @@ DEPENDENCIES
   puppet-syntax
   puppetlabs_spec_helper
   rake
-  rspec-puppet (~> 1.0.0)
+  rspec-puppet!

spec/classes/coverage_spec.rb

@@ -0,0 +1 @@
+at_exit { RSpec::Puppet::Coverage.report! }

spec/classes/dns_server_config_spec.rb → spec/classes/dns__server__config_spec.rb

@@ -2,9 +2,9 @@
 
 describe 'dns::server::config', :type => :class do
 
-  context "on an unknown OS" do
-    let :facts do { :concat_basedir  => '/dne', } end
-    it  { expect { subject }.to raise_error() }
+  context "on an unsupported OS" do
+    let :facts do { :osfamily => 'Solaris', :concat_basedir  => '/dne', } end
+    it { should raise_error(/dns::server is incompatible with this osfamily/) }
   end
 
   context "on a Debian OS" do
@@ -15,6 +15,7 @@
         :concat_basedir         => '/dne',
       }
     end
+
     it { should contain_file('/etc/bind/').with_owner('bind') }
   end
 

spec/classes/dns_server_install_spec.rb → spec/classes/dns__server__install_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe 'dns::server::install', :type => :class do
-  context "on an unknown OS" do
-    it  { expect { subject }.to raise_error() }
+  context "on an unsupported OS" do
+    it{ should raise_error(/dns::server is incompatible with this osfamily/) }
   end
 
   context "on a Debian OS" do
@@ -12,6 +12,7 @@
         :operatingsystemrelease => '6',
       }
     end
+    it { should contain_class('dns::server::params') }
     it { should contain_package("bind9") }
   end
 

spec/classes/dns__server__service_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe 'dns::server::service' do
+    let(:facts) {{ :concat_basedir => '/mock_dir' }}
+    context 'on a supported OS' do
+        let(:facts) {{ :osfamily => 'Debian' }}
+
+        it { should contain_service('bind9').with_require('Class[Dns::Server::Config]') }
+    end
+
+    context 'on an unsupported OS' do
+        let(:facts) {{ :osfamily => 'Solaris' }}
+
+        it { should raise_error(/dns::server is incompatible with this osfamily: Solaris/) }
+    end
+
+end

spec/classes/dns__server_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe 'dns::server' do
+    let(:facts) {{ :osfamily => 'Debian', :concat_basedir  => '/dne' }}
+
+    it { should contain_class('dns::server::install') }
+    it { should contain_class('dns::server::config') }
+    it { should contain_class('dns::server::service') }
+end

spec/defines/dns__acl_spec.rb

@@ -2,27 +2,22 @@
 
 describe 'dns::acl' do
   let(:title) { 'trusted' }
-
   let(:facts) { { :concat_basedir => '/tmp' } }
 
   context 'passing a string to data' do
     let :params do
       { :data => '192.168.0.0/24' }
     end
 
-    it 'should fail input validation' do
-      expect { subject }.to raise_error(Puppet::Error, /is not an Array/)
-    end
+    it { should raise_error(Puppet::Error, /is not an Array/) }
   end
 
   context 'passing an array to data' do
     let :params do
       { :data => [ '192.168.0.0/24' ] }
     end
 
-    it 'should pass input validation' do
-      expect { subject }.to_not raise_error
-    end
+    it { should_not raise_error }
 
     it {
       should contain_concat__fragment('named.conf.local.acl.trusted.include').

spec/defines/dns_server_options_spec.rb → spec/defines/dns__server__options_spec.rb

@@ -28,9 +28,8 @@
       { :forwarders => '8.8.8.8' }
     end
 
-    it 'should fail input validation' do
-      expect { subject }.to raise_error(Puppet::Error, /is not an Array/)
-    end
+    it { should raise_error(Puppet::Error, /is not an Array/) }
+
   end
 
 end

spec/defines/dns_zone_spec.rb → spec/defines/dns__zone_spec.rb

@@ -9,9 +9,7 @@
     let :facts  do { :osfamily => 'Debian', :concat_basedir => '/dne' } end
     let :params do { :allow_transfer => '127.0.0.1' } end
 
-    it 'should fail input validation' do
-      expect { subject }.to raise_error(Puppet::Error, /is not an Array/)
-    end
+    it { should raise_error(Puppet::Error, /is not an Array/) }
   end
 
   context 'passing an array to data' do
@@ -22,9 +20,7 @@
       }
     end
 
-    it 'should pass input validation' do
-      expect { subject }.to_not raise_error
-    end
+    it { should_not raise_error }
 
     it {
       should contain_concat__fragment('named.conf.local.test.com.include').
@@ -56,7 +52,7 @@
       with_content(/2001:db8::\/32/)
     }
 
-    it { 
+    it {
       should contain_concat('/etc/bind/zones/db.test.com.stage')
     }