diff options
author | TP Honey <tphoney@users.noreply.github.com> | 2015-04-22 17:19:08 +0100 |
---|---|---|
committer | TP Honey <tphoney@users.noreply.github.com> | 2015-04-22 17:19:08 +0100 |
commit | 126a2bde0ba826d334df04725c062a286e354105 (patch) | |
tree | 27efacaf21e1429d261fd9172b58c1a3571d5d2b | |
parent | 7aab800dff04c485308edd906ce234e83ffb154e (diff) | |
parent | 7dc0025a0c8f3ddea12bf642a69a62e22daef071 (diff) |
Merge pull request #237 from cmurphy/rspec-puppet-2
Testing updates
-rw-r--r-- | .sync.yml | 5 | ||||
-rw-r--r-- | .travis.yml | 19 | ||||
-rw-r--r-- | Gemfile | 3 |
3 files changed, 20 insertions, 7 deletions
@@ -1,6 +1,11 @@ --- .travis.yml: script: "\"bundle exec rake spec SPEC_OPTS='--format documentation'\"" + extras: + - rvm: 1.8.7 + env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0" + - rvm: 1.8.7 + env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0" Rakefile: unmanaged: true spec/spec_helper.rb: diff --git a/.travis.yml b/.travis.yml index 8cfaf23..0fc75e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,28 @@ --- +sudo: false language: ruby bundler_args: --without system_tests script: "bundle exec rake spec SPEC_OPTS='--format documentation'" matrix: fast_finish: true include: + - rvm: 1.9.3 + env: PUPPET_GEM_VERSION="~> 3.4.0" - rvm: 1.8.7 - env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0" - - rvm: 1.8.7 - env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0" + env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 1.9.3 env: PUPPET_GEM_VERSION="~> 3.0" - - rvm: 2.0.0 + - rvm: 1.9.3 + env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" + - rvm: 2.1.5 env: PUPPET_GEM_VERSION="~> 3.0" + - rvm: 2.1.5 + env: PUPPET_GEM_VERSION="~> 3.4.0" + - rvm: 2.1.5 + env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" + - rvm: 1.8.7 + env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0" + - rvm: 1.8.7 + env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0" notifications: email: false @@ -11,11 +11,8 @@ def location_for(place, fake_version = nil) end group :development, :unit_tests do - gem 'rake', :require => false gem 'rspec-core', '3.1.7', :require => false - gem 'rspec-puppet', '~> 1.0', :require => false gem 'puppetlabs_spec_helper', :require => false - gem 'puppet-lint', :require => false gem 'simplecov', :require => false gem 'puppet_facts', :require => false gem 'json', :require => false |