Merge pull request puppetlabs#593 from cmurphy/rspec-puppet-2

Testing updates

Author: Morgan Haskel

.sync.yml

@@ -1,9 +1,9 @@
 ---
 .travis.yml:
   extras:
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.5" STRICT_VARIABLES="yes"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.5" STRICT_VARIABLES="yes"
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
 spec/spec_helper.rb:
   unmanaged: true

.travis.yml

@@ -1,21 +1,28 @@
 ---
+sudo: false
 language: ruby
 bundler_args: --without system_tests
 script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
   - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 3.4.0"
+  - rvm: 1.8.7
     env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.0.0
+  - rvm: 1.9.3
     env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.5" STRICT_VARIABLES="yes"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.5" STRICT_VARIABLES="yes"
+    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+  - rvm: 2.1.5
+    env: PUPPET_GEM_VERSION="~> 3.0"
+  - rvm: 2.1.5
+    env: PUPPET_GEM_VERSION="~> 3.4.0"
+  - rvm: 2.1.5
+    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
 notifications:
   email: false

Gemfile

@@ -1,11 +1,8 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :unit_tests do
-  gem 'rake',                    :require => false
   gem 'rspec-core', '3.1.7',     :require => false
-  gem 'rspec-puppet', '~> 1.0',  :require => false
   gem 'puppetlabs_spec_helper',  :require => false
-  gem 'puppet-lint',             :require => false
   gem 'simplecov',               :require => false
   gem 'puppet_facts',            :require => false
   gem 'json',                    :require => false

Rakefile

@@ -1,7 +1,7 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 
-PuppetLint.configuration.fail_on_warnings
+PuppetLint.configuration.fail_on_warnings = true
 PuppetLint.configuration.send('relative')
 PuppetLint.configuration.send('disable_80chars')
 PuppetLint.configuration.send('disable_class_inherits_from_params_class')

spec/unit/defines/server/pg_hba_rule_spec.rb

@@ -110,7 +110,7 @@ class { 'postgresql::server': }
         }
       end
       it 'should fail parsing when type is not valid' do
-        expect {subject}.to raise_error(Puppet::Error,
+        expect { catalogue }.to raise_error(Puppet::Error,
           /The type you specified \[invalid\] must be one of/)
       end
     end
@@ -134,7 +134,7 @@ class { 'postgresql::server': }
       end
 
       it 'should fail parsing when auth_method is not valid' do
-        expect {subject}.to raise_error(Puppet::Error,
+        expect { catalogue }.to raise_error(Puppet::Error,
           /The auth_method you specified \[invalid\] must be one of/)
       end
     end
@@ -161,7 +161,7 @@ class { 'postgresql::server': }
       end
 
       it 'should fail parsing when auth_method is not valid' do
-        expect {subject}.to raise_error(Puppet::Error,
+        expect { catalogue }.to raise_error(Puppet::Error,
           /The auth_method you specified \[peer\] must be one of: trust, reject, md5, sha1, password, gss, sspi, krb5, ident, ldap, radius, cert, pam/)
       end
     end

spec/unit/defines/server/pg_ident_rule_spec.rb

@@ -59,7 +59,7 @@ class { 'postgresql::server': }
       }
     end
     it 'should fail because $manage_pg_ident_conf is false' do
-      expect {subject}.to raise_error(Puppet::Error,
+      expect { catalogue }.to raise_error(Puppet::Error,
                                       /postgresql::server::manage_pg_ident_conf has been disabled/)
     end
   end