make tests work on 1.8.7

voxpupuli · Dec 21, 2015 · 1208066 · 1208066
1 parent ce41ba2
commit 1208066
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ before_install: rm Gemfile.lock || true
 sudo: false
 cache: bundler
 rvm:
+  - 1.8.7
   - 1.9.3
   - 2.0.0
   - 2.1.0
@@ -13,6 +14,8 @@ env:
   - PUPPET_VERSION="~> 3.1.0"
   - PUPPET_VERSION="~> 3.3.0"
   - PUPPET_VERSION="~> 3.7.4" FUTURE_PARSER=yes STRICT_VARIABLES=yes
+  - PUPPET_VERSION="~> 3.8.4"
+  - PUPPET_VERSION="~> 3.8.4" FUTURE_PARSER=yes STRICT_VARIABLES=yes
   - PUPPET_VERSION="~> 4.0.0"
   - PUPPET_VERSION="~> 4.1.0"
 matrix:
@@ -35,8 +38,12 @@ matrix:
     env: PUPPET_VERSION="~> 3.4.0"
   - rvm: 1.9.3
     env: PUPPET_VERSION="~> 4.0.0"
+  - rvm: 1.8.7
+    env: PUPPET_VERSION="~> 4.0.0"
   - rvm: 2.0.0
     env: PUPPET_VERSION="~> 4.0.0"
+  - rvm: 1.8.7
+    env: PUPPET_VERSION="~> 4.1.0"
   - rvm: 1.9.3
     env: PUPPET_VERSION="~> 4.1.0"
   - rvm: 2.0.0

diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
@@ -297,7 +297,7 @@
     it { should contain_file('consul config.json').with_content(/"server": true/) }
     it { should contain_file('consul config.json').with_content(/"http": -1,/) }
     it { should contain_file('consul config.json').with_content(/"https": 8500/) }
-    it { should contain_file('consul config.json').with_content(/"ports": {/) }
+    it { should contain_file('consul config.json').with_content(/"ports": \{/) }
   end
 
   context "When asked not to manage the user" do
@@ -360,7 +360,7 @@
     it { should contain_file('consul config.json').with(
       :owner => 'custom_consul_user',
       :group => 'custom_consul_group',
-      :mode  => '0600',
+      :mode  => '0600'
     )}
   end