RickRongen/puppetlabs-java
1
0
Fork 0
Code Releases Activity

mocha version update

Browse Source
This commit is contained in:
Eric Putnam
2016-11-02 16:10:17 -07:00
parent daddd9a115
commit 1dd62ddc33
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@@ -4,6 +4,9 @@ sudo: false
language: ruby language: ruby
cache: bundler cache: bundler
script: "bundle exec rake validate lint spec" script: "bundle exec rake validate lint spec"
#Inserting below due to the following issue: https://github.com/travis-ci/travis-ci/issues/3531#issuecomment-88311203
before_install:
- gem update bundler
matrix: matrix:
fast_finish: true fast_finish: true
include: include:

2
Gemfile
View File

@@ -23,6 +23,7 @@ group :development, :unit_tests do
gem 'puppetlabs_spec_helper', '>= 1.2.1' gem 'puppetlabs_spec_helper', '>= 1.2.1'
gem 'rspec-puppet', '>= 2.3.2' gem 'rspec-puppet', '>= 2.3.2'
gem 'rspec-puppet-facts' gem 'rspec-puppet-facts'
gem 'mocha', '< 1.2.0'
gem 'simplecov' gem 'simplecov'
gem 'parallel_tests', '< 2.10.0' if RUBY_VERSION < '2.0.0' gem 'parallel_tests', '< 2.10.0' if RUBY_VERSION < '2.0.0'
gem 'parallel_tests' if RUBY_VERSION >= '2.0.0' gem 'parallel_tests' if RUBY_VERSION >= '2.0.0'
@@ -34,6 +35,7 @@ end
group :system_tests do group :system_tests do
gem 'beaker', *location_from_env('BEAKER_VERSION', []) if RUBY_VERSION >= '2.3.0' gem 'beaker', *location_from_env('BEAKER_VERSION', []) if RUBY_VERSION >= '2.3.0'
gem 'beaker', *location_from_env('BEAKER_VERSION', ['< 3']) if RUBY_VERSION < '2.3.0' gem 'beaker', *location_from_env('BEAKER_VERSION', ['< 3']) if RUBY_VERSION < '2.3.0'
gem 'beaker-pe' if RUBY_VERSION >= '2.3.0'
gem 'beaker-rspec', *location_from_env('BEAKER_RSPEC_VERSION', ['>= 3.4']) gem 'beaker-rspec', *location_from_env('BEAKER_RSPEC_VERSION', ['>= 3.4'])
gem 'serverspec' gem 'serverspec'
gem 'beaker-puppet_install_helper' gem 'beaker-puppet_install_helper'