From 3742bd6f464dde2c6d253d6ed3cbdbc6f671aec1 Mon Sep 17 00:00:00 2001
From: Paula McMaw <paula@puppet.com>
Date: Tue, 25 Oct 2016 14:56:57 +0100
Subject:  This is to pin ruby version to parallel_tests

---
 .sync.yml   | 2 ++
 .travis.yml | 3 ---
 Gemfile     | 3 ++-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index 431b9d1..d80d54a 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -5,3 +5,5 @@
     - 'spec/fixtures/manifests/site.pp'
     - 'spec/fixtures/modules/*'
 
+spec/spec_helper.rb:
+  allow_deprecations: true
diff --git a/.travis.yml b/.travis.yml
index cf44471..4e549bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,9 +28,6 @@ matrix:
   - rvm: 2.1.5
     bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
-  - rvm: 2.1.5
-    bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 3.7.0" FUTURE_PARSER="yes"
   - rvm: 2.1.5
     bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 3.0"
diff --git a/Gemfile b/Gemfile
index 0a7542d..c8af871 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,7 +26,8 @@ group :development, :unit_tests do
   gem 'mocha', '< 1.2.0'
   gem 'rspec-puppet-facts'
   gem 'simplecov'
-  gem 'parallel_tests'
+  gem 'parallel_tests', '< 2.10.0' if RUBY_VERSION < '2.0.0'
+  gem 'parallel_tests' if RUBY_VERSION >= '2.0.0'
   gem 'rubocop', '0.41.2' if RUBY_VERSION < '2.0.0'
   gem 'rubocop' if RUBY_VERSION >= '2.0.0'
   gem 'rubocop-rspec', '~> 1.6' if RUBY_VERSION >= '2.3.0'
-- 
cgit v1.2.3