Merge pull request #14 from aerostitch/fix_rspec_errors

Preparing release 1.1.1
tubemogul · Jul 19, 2016 · 642b81a · 642b81a
2 parents 2f46810 + 5aff1ac
commit 642b81a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,8 @@ env:
   - PUPPET_VERSION="~> 4.1.0" STRICT_VARIABLES=yes
   - PUPPET_VERSION="~> 4.2.0" STRICT_VARIABLES=yes
   - PUPPET_VERSION="~> 4.3.0" STRICT_VARIABLES=yes
+  - PUPPET_VERSION="~> 4.4.0" STRICT_VARIABLES=yes
+  - PUPPET_VERSION="~> 4.5.0" STRICT_VARIABLES=yes
 rvm:
   - 1.9.3
   - 2.0

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+2016-07-19 Release 1.1.1:
+- Addded notify to refresh service after creating/modifying XDR credential file
+- Added tests for puppet 4.4 and 4.5
+- Fixed a puppet-lint warning
 2016-07-18 Release 1.1.0:
 - adding support for credential files on XDR
 2016-03-02 Release 1.0.1:

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "TubeMogul-aerospike",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "author": "TubeMogul Inc.",
   "summary": "Aerospike servers management via Puppet",
   "license": "Apache-2.0",

diff --git a/spec/classes/aerospike_spec.rb b/spec/classes/aerospike_spec.rb
@@ -17,9 +17,9 @@
 
         # Tests related to the aerospike base class content
         it { should create_class('aerospike') }
-        it { should contain_class('aerospike::install').that_comes_before('aerospike::config') }
+        it { should contain_class('aerospike::install').that_comes_before('Class[aerospike::config]') }
         it { should contain_class('aerospike::config') }
-        it { should contain_class('aerospike::service').that_subscribes_to('aerospike::config') }
+        it { should contain_class('aerospike::service').that_subscribes_to('Class[aerospike::config]') }
 
         # Tests related to the aerospike::install class
         it { should contain_class('archive') }
@@ -180,9 +180,9 @@
 
         # Tests related to the aerospike base class content
         it { should create_class('aerospike') }
-        it { should contain_class('aerospike::install').that_comes_before('aerospike::config') }
+        it { should contain_class('aerospike::install').that_comes_before('Class[aerospike::config]') }
         it { should contain_class('aerospike::config') }
-        it { should contain_class('aerospike::service').that_subscribes_to('aerospike::config') }
+        it { should contain_class('aerospike::service').that_subscribes_to('Class[aerospike::config]') }
 
         # Tests related to the aerospike::install class
         it do

diff --git a/spec/defines/xdr_credentials_file_spec.rb b/spec/defines/xdr_credentials_file_spec.rb
@@ -11,12 +11,12 @@
     }
 
     it do
-      should contain_file('/etc/aerospike/security-credentials_DC1.txt').with({
-        'ensure' => 'present',
-        'mode'   => '0600',
-        'owner'  => 'root',
-        'group'  => 'root',
-        })\
+      should contain_file('/etc/aerospike/security-credentials_DC1.txt')\
+        .with_ensure('present')\
+        .with_mode('0600')\
+        .with_owner('root')\
+        .with_group('root')\
+        .with_notify('Service[aerospike]')\
         .with_content(/^credentials$/)\
         .with_content(/username xdr_user_DC1$/)\
         .with_content(/password xdr_password_DC1$/)