summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaula McMaw <paula@puppet.com>2016-10-25 14:56:57 +0100
committerPaula McMaw <paula@puppet.com>2016-10-25 14:56:57 +0100
commit3742bd6f464dde2c6d253d6ed3cbdbc6f671aec1 (patch)
tree9f1b183832629eab8ab172d614798d939c8c5227
parentabb2c51ba4a9d99fc51ffe40290a76ab7da5bc48 (diff)
This is to pin ruby version to parallel_tests
-rw-r--r--.sync.yml2
-rw-r--r--.travis.yml3
-rw-r--r--Gemfile3
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
@@ -30,9 +30,6 @@ matrix:
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"
- rvm: 1.9.3
bundler_args: --without system_tests
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'