rspec-puppet 0.1.0 → 0.1.1

data/README.md

@@ -88,6 +88,17 @@ the generic `with_<parameter>` chains.
 it { should contain_package('mysql-server').with_ensure('present') }
 ```
 
+You can use the `with` method to verify the value of multiple parameters.
+
+```ruby
+it do should contain_service('keystone').with(
+  'ensure'     => 'running',
+  'enable'     => 'true',
+  'hasstatus'  => 'true',
+  'hasrestart' => 'true'
+) end
+```
+
 You can also test that specific parameters have been left undefined with the
 generic `without_<parameter>` chains.
 
@@ -95,6 +106,15 @@ generic `without_<parameter>` chains.
 it { should contain_file('/foo/bar').without_mode }
 ```
 
+You can use the without method to verify that a list of parameters have not been
+defined
+
+```ruby
+it { should contain_service('keystone').without(
+  ['restart', 'status']
+)}
+```
+
 ### Writing tests
 
 #### Basic test structure

data/Rakefile

@@ -2,5 +2,6 @@ require 'rake'
 require 'rspec/core/rake_task'
 
 task :default => :test
+task :spec => :test
 
 RSpec::Core::RakeTask.new(:test)

data/lib/rspec-puppet.rb

@@ -1,4 +1,5 @@
 require 'puppet'
+require 'rspec'
 require 'rspec-puppet/matchers'
 require 'rspec-puppet/example'
 

data/lib/rspec-puppet/matchers/create_generic.rb

@@ -9,6 +9,18 @@ module RSpec::Puppet
         @title = args[0]
       end
 
+      def with(*args, &block)
+        params = args.shift
+        @expected_params = (@expected_params || []) | params.to_a
+        self
+      end
+
+      def without(*args, &block)
+        params = args.shift
+        @expected_undef_params = (@expected_undef_params || []) | params.to_a
+        self
+      end
+
       def method_missing(method, *args, &block)
         if method.to_s =~ /^with_/
           param = method.to_s.gsub(/^with_/, '')
@@ -30,11 +42,19 @@ module RSpec::Puppet
         if resource.nil?
           ret = false
         else
+          rsrc_hsh = resource.to_hash
           if @expected_params
             @expected_params.each do |name, value|
-              unless resource.send(:parameters)[name.to_sym].to_s == value.to_s
-                ret = false
-                (@errors ||= []) << "#{name.to_s} set to `#{value.inspect}`"
+              if value.kind_of?(Regexp) then
+                unless rsrc_hsh[name.to_sym].to_s =~ value
+                  ret = false
+                  (@errors ||= []) << "#{name.to_s} matching `#{value.inspect}` but its value of `#{rsrc_hsh[name.to_sym].inspect}` does not"
+                end
+              else
+                unless rsrc_hsh[name.to_sym].to_s == value.to_s
+                  ret = false
+                  (@errors ||= []) << "#{name.to_s} set to `#{value.inspect}` but it is set to `#{rsrc_hsh[name.to_sym].inspect}` in the catalogue"
+                end
               end
             end
           end
@@ -71,7 +91,7 @@ module RSpec::Puppet
       end
 
       def errors
-        @errors.nil? ? "" : " with #{@errors.join(', ')}"
+        @errors.nil? ? "" : " with #{@errors.join(', and parameter ')}"
       end
     end
 

data/rspec-puppet.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'rspec-puppet'
-  s.version = '0.1.0'
+  s.version = '0.1.1'
   s.homepage = 'https://github.com/rodjek/rspec-puppet/'
   s.summary = 'RSpec tests for your Puppet manifests'
   s.description = 'RSpec tests for your Puppet manifests'
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
     'Rakefile',
     'README.md',
     'rspec-puppet.gemspec',
+    'spec/classes/boolean_regexp_spec.rb',
     'spec/classes/boolean_spec.rb',
     'spec/classes/sysctl_common_spec.rb',
     'spec/defines/sysctl_before_spec.rb',

data/spec/classes/boolean_regexp_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe 'boolean' do
+  let(:title) { 'bool.testing' }
+  let(:params) { { :bool => false } }
+  let(:message_re) { /bool is false/ }
+
+  it { should create_notify("bool testing").with_message(message_re) }
+  it { should_not create_notify("bool testing").with_message(/true/) }
+end

data/spec/classes/sysctl_common_spec.rb

@@ -4,6 +4,32 @@ describe 'sysctl::common' do
   it { should contain_exec('sysctl/reload') \
     .with_command('/sbin/sysctl -p /etc/sysctl.conf').with_returns([0, 2]) }
   it { should_not create_augeas('foo') }
+  describe 'when using with to specify a hash of parameters' do
+    it 'should fail if the parameter is not contained in the resource' do
+      expect do
+        subject.should contain_exec('sysctl/reload').with('foo' => 'bar')
+      end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+    end
+    it 'should pass if the parameters are contained in the resource' do
+      subject.should contain_exec('sysctl/reload').with(
+        'refreshonly' => 'true',
+        'returns' => [0, 2]
+      )
+    end
+  end
+  describe 'when using without to specify parameter name(s)' do
+    it 'should pass if the parameter name is not contained in the resource' do
+      subject.should contain_exec('sysctl/reload').without('foo')
+    end
+    it 'should pass if the parameter names are not contained in the resource' do
+      subject.should contain_exec('sysctl/reload').without(['foo', 'bar'])
+    end
+    it 'should fail if any of the parameter names are contained in the resource' do
+      expect do
+        subject.should contain_exec('sysctl/reload').without(['foo', 'returns'])
+      end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+    end
+  end
 end
 
 describe 'sysctl::common' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-puppet
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Tim Sharpe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-03 00:00:00 Z
+date: 2012-01-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -55,6 +55,7 @@ files:
 - Rakefile
 - README.md
 - rspec-puppet.gemspec
+- spec/classes/boolean_regexp_spec.rb
 - spec/classes/boolean_spec.rb
 - spec/classes/sysctl_common_spec.rb
 - spec/defines/sysctl_before_spec.rb