Drop pinning for 1.8.7 and tests

moonape1226 · Dec 2, 2016 · 6ac29f1 · 6ac29f1
1 parent 51f9671
commit 6ac29f1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 29 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,45 +5,21 @@ before_install: rm Gemfile.lock || true
 sudo: false
 cache: bundler
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
   - 2.1.0
 script: bundle exec rake test
 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:
   exclude:
-  - rvm: 1.9.3
-    env: PUPPET_VERSION="~> 2.7.0"
-  - rvm: 2.0.0
-    env: PUPPET_VERSION="~> 2.7.0"
-  - rvm: 2.0.0
-    env: PUPPET_VERSION="~> 3.1.0"
-  - rvm: 2.1.0
-    env: PUPPET_VERSION="~> 2.7.0"
-  - rvm: 2.1.0
-    env: PUPPET_VERSION="~> 3.1.0"
-  - rvm: 2.1.0
-    env: PUPPET_VERSION="~> 3.2.0"
   - rvm: 2.1.0
     env: PUPPET_VERSION="~> 3.3.0"
   - rvm: 2.1.0
     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/Gemfile b/Gemfile
@@ -11,15 +11,17 @@ group :development do
 end
 
 group :test do
-  gem "json"
+  # Pin for 1.9.3 compatibility for now
+  gem "json", '~> 1.8.3'
+  gem "json_pure", '~> 1.8.3'
+
   gem "rake"
   gem "puppet", ENV['PUPPET_VERSION'] || '~> 4'
   gem "puppet-lint"
 
-  # Pin for 1.8.7 compatibility for now
-  gem "rspec", '< 3.2.0'
-  gem "rspec-core", "3.1.7"
-  gem "rspec-puppet", "~> 2.1"
+  gem "rspec"
+  gem "rspec-core"
+  gem "rspec-puppet"
 
   gem "puppet-syntax"
   gem "puppetlabs_spec_helper"