Rspec 3 and 2 compatibility

.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.2
 notifications:
   email:
     - [email protected]
@@ -13,7 +14,9 @@ env:
   - PUPPET_VERSION=3.1.1
   - PUPPET_VERSION=3.2.4
   - PUPPET_VERSION=3.3.2
-  - PUPPET_VERSION=3.4.1
+  - PUPPET_VERSION=3.4.3
+  - PUPPET_VERSION=3.5.1
+  - RSPEC_VERSION=2.14
 matrix:
   exclude:
     - rvm: 1.9.2
@@ -28,3 +31,15 @@ matrix:
       env: PUPPET_VERSION=3.0.2
     - rvm: 2.0.0
       env: PUPPET_VERSION=3.1.1
+    - rvm: 2.1.2
+      env: PUPPET_VERSION=2.6.18
+    - rvm: 2.1.2
+      env: PUPPET_VERSION=2.7.23
+    - rvm: 2.1.2
+      env: PUPPET_VERSION=3.0.2
+    - rvm: 2.1.2
+      env: PUPPET_VERSION=3.1.1
+    - rvm: 2.1.2
+      env: PUPPET_VERSION=3.2.4
+    - rvm: 2.1.2
+      env: PUPPET_VERSION=3.3.2

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 2.7']
-rspecversion = ENV.key?('RSPEC_VERSION') ? "= #{ENV['RSPEC_VERSION']}" : ['>= 2.9 ', '< 3.0.0']
+rspecversion = ENV.key?('RSPEC_VERSION') ? "= #{ENV['RSPEC_VERSION']}" : ['>= 2.9']
 
 gem 'rake'
 gem 'rspec', rspecversion

lib/rspec-puppet/example.rb

@@ -9,19 +9,23 @@ def c.escaped_path(*parts)
     Regexp.compile(parts.join('[\\\/]'))
   end
 
-  c.include RSpec::Puppet::DefineExampleGroup, :type => :define, :example_group => {
-    :file_path => c.escaped_path(%w[spec defines])
-  }
-
-  c.include RSpec::Puppet::ClassExampleGroup, :type => :class, :example_group => {
-    :file_path => c.escaped_path(%w[spec classes])
-  }
-
-  c.include RSpec::Puppet::FunctionExampleGroup, :type => :puppet_function, :example_group => {
-    :file_path => c.escaped_path(%w[spec functions])
-  }
-
-  c.include RSpec::Puppet::HostExampleGroup, :type => :host, :example_group => {
-    :file_path => c.escaped_path(%w[spec hosts])
-  }
+  if RSpec::Version::STRING < '3'
+    c.include RSpec::Puppet::DefineExampleGroup, :type => :define, :example_group => {
+      :file_path => c.escaped_path(%w[spec defines])
+    }
+    c.include RSpec::Puppet::ClassExampleGroup, :type => :class, :example_group => {
+      :file_path => c.escaped_path(%w[spec classes])
+    }
+    c.include RSpec::Puppet::FunctionExampleGroup, :type => :puppet_function, :example_group => {
+      :file_path => c.escaped_path(%w[spec functions])
+    }
+    c.include RSpec::Puppet::HostExampleGroup, :type => :host, :example_group => {
+      :file_path => c.escaped_path(%w[spec hosts])
+   }
+  else
+    c.include RSpec::Puppet::DefineExampleGroup, :type => :define, :file_path => c.escaped_path(%w[spec defines])
+    c.include RSpec::Puppet::ClassExampleGroup, :type => :class, :file_path => c.escaped_path(%w[spec classes])
+    c.include RSpec::Puppet::FunctionExampleGroup, :type => :puppet_function, :file_path => c.escaped_path(%w[spec functions])
+    c.include RSpec::Puppet::HostExampleGroup, :type => :host, :file_path => c.escaped_path(%w[spec hosts])
+  end
 end

lib/rspec-puppet/matchers/compile.rb

@@ -51,7 +51,7 @@ def description
         end
       end
 
-      def failure_message_for_should
+      def failure_message
         unless @cycles.empty?
           "dependency cycles found: #{@cycles.join('; ')}"
         else
@@ -63,7 +63,7 @@ def failure_message_for_should
         end
       end
 
-      def failure_message_for_should_not
+      def failure_message_when_negated
         "expected that the catalogue would not compile but it does"
       end
 

lib/rspec-puppet/matchers/count_generic.rb

@@ -49,11 +49,11 @@ def description
         desc.join(" ")
       end
 
-      def failure_message_for_should
+      def failure_message
         "expected that the catalogue would " + description + " but it contains #{@actual_number}"
       end
 
-      def failure_message_for_should_not
+      def failure_message_when_negated
         "expected that the catalogue would not " + description + " but it does"
       end
 

lib/rspec-puppet/matchers/create_generic.rb

@@ -105,11 +105,11 @@ def matches?(catalogue)
         end
       end
 
-      def failure_message_for_should
+      def failure_message
         "expected that the catalogue would contain #{@referenced_type}[#{@title}]#{errors}"
       end
 
-      def failure_message_for_should_not
+      def failure_message_when_negated
         "expected that the catalogue would not contain #{@referenced_type}[#{@title}]#{errors}"
       end
 

lib/rspec-puppet/matchers/include_class.rb

@@ -12,9 +12,17 @@ module ManifestMatchers
         "include Class[#{expected_class}]"
       end
 
-      failure_message_for_should do |actual|
-        "expected that the catalogue would include Class[#{expected_class}]"
+      if RSpec::Version::STRING < '3'
+        failure_message_for_should do |actual|
+          "expected that the catalogue would include Class[#{expected_class}]"
+        end
+      else
+        failure_message do |actual|
+          "expected that the catalogue would include Class[#{expected_class}]"
+        end
       end
+
     end
+
   end
 end

lib/rspec-puppet/matchers/run.rb

@@ -81,11 +81,11 @@ def and_raise_error(error_or_message, message=nil)
         self
       end
 
-      def failure_message_for_should
+      def failure_message
         failure_message_generic(:should, @func_obj)
       end
 
-      def failure_message_for_should_not
+      def failure_message_when_negated
         failure_message_generic(:should_not, @func_obj)
       end
 

lib/rspec-puppet/support.rb

@@ -198,5 +198,13 @@ def build_node(name, opts = {})
       opts.merge!({:environment => node_environment})
       Puppet::Node.new(name, opts)
     end
+
+    def rspec_compatibility
+      if RSpec::Version::STRING < '3'
+        # RSpec 2 compatibility:
+        alias_method :failure_message_for_should, :failure_message
+        alias_method :failure_message_for_should_not, :failure_message_when_negated
+      end
+    end
   end
 end

rspec-puppet.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['LICENSE.md', 'README.md', 'lib/**/*', 'bin/**/*']
 
-  s.add_dependency 'rspec', '< 3.0.0'
+  s.add_dependency 'rspec'
 
   s.authors = ['Tim Sharpe']
   s.email = '[email protected]'

spec/classes/sysctl_common_spec.rb

@@ -7,36 +7,36 @@
   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')
+        expect(subject).to contain_exec('sysctl/reload').with('foo' => 'bar')
       end.to 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(
+      expect(subject).to 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')
+      expect(subject).to 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'])
+      expect(subject).to 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'])
+        expect(subject).to contain_exec('sysctl/reload').without(['foo', 'returns'])
       end.to raise_error(RSpec::Expectations::ExpectationNotMetError)
     end
   end
   describe 'when using without to specify parameter value(s)' do
     it 'should pass if the parameter value is not contained in the resource' do
-      subject.should contain_exec('sysctl/reload').without_refreshonly('false')
+      expect(subject).to contain_exec('sysctl/reload').without_refreshonly('false')
     end
     it 'should fail if the parameter value is contained in the resource' do
       expect do
-        subject.should contain_exec('sysctl/reload').without_refreshonly('true')
+        expect(subject).to contain_exec('sysctl/reload').without_refreshonly('true')
       end.to raise_error(RSpec::Expectations::ExpectationNotMetError)
     end
   end
@@ -65,15 +65,15 @@
   }
   it 'should fail if not enough parameters are contained in the resource' do
     expect do
-      subject.should contain_exec('sysctl/reload').only_with(
+      expect(subject).to contain_exec('sysctl/reload').only_with(
         :command => '/sbin/sysctl -p /etc/sysctl.conf',
         :returns => [0, 2]
       )
     end.to raise_error(RSpec::Expectations::ExpectationNotMetError)
   end
   it 'should fail if different parameters are contained in the resource' do
     expect do
-      subject.should contain_exec('sysctl/reload').only_with(
+      expect(subject).to contain_exec('sysctl/reload').only_with(
         :command => '/sbin/sysctl -p /etc/sysctl.conf',
         :refreshonly => true,
         :creates => '/tmp/bla'

spec/classes/test_classes_used_spec.rb

@@ -2,11 +2,11 @@
 
 describe 'test::classes_used' do
   it {
-    RSpec.should receive(:deprecate).with(:include_class, :contain_class)
+    expect(RSpec).to receive(:deprecate).with(:include_class, :contain_class)
     should include_class('test::bare_class')
   }
   it {
-    RSpec.should receive(:deprecate).with(:include_class, :contain_class)
+    expect(RSpec).to receive(:deprecate).with(:include_class, :contain_class)
     should include_class('test::parameterised_class')
   }
 

spec/functions/catalogue_spec.rb

@@ -3,18 +3,18 @@
 describe 'split' do
   describe 'rspec group' do
     it 'should have a catalogue method' do
-      catalogue.should be_a(Puppet::Resource::Catalog)
+      expect(catalogue).to be_a(Puppet::Resource::Catalog)
     end
 
     it 'catalogue should not change after subject is called' do
-      catalogue.should be_a(Puppet::Resource::Catalog)
+      expect(catalogue).to be_a(Puppet::Resource::Catalog)
       pre_id = catalogue.object_id
 
       should run.with_params('aoeu', 'o').and_return(['a', 'eu'])
 
       post_id = catalogue.object_id
 
-      pre_id.should eq post_id
+      expect(pre_id).to eq post_id
     end
   end
 end