diff options
| author | Mickaël Canévet <mickael.canevet@camptocamp.com> | 2014-12-13 09:07:30 +0100 |
|---|---|---|
| committer | Mickaël Canévet <mickael.canevet@camptocamp.com> | 2014-12-13 09:07:30 +0100 |
| commit | d211e0e1ac1833d929a2226bea1f1265c9cf980f (patch) | |
| tree | b52bc8c49b88608f979b7ba1a44582e769a8c2f0 | |
| parent | 02da3de25b7c4ad23c529f4d280d6b7f812e76d2 (diff) | |
Update with modulesync
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 6 |
3 files changed, 4 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index e387fcd..7d246af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,18 +6,13 @@ matrix: fast_finish: true include: - 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" FACTER_GEM_VERSION="~> 1.7.0" - rvm: 1.9.3 env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 2.0.0 env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 2.0.0 env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" - allow_failures: - - rvm: 2.0.0 - env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" notifications: email: false deploy: @@ -6,7 +6,7 @@ group :development, :unit_tests do gem 'puppetlabs_spec_helper', :require => false gem 'puppet-lint', :require => false gem 'simplecov', :require => false - gem 'puppet_facts', :require => false, :git => 'https://github.com/camptocamp/puppet_facts.git' + gem 'rspec-puppet-facts', :require => false gem 'json', :require => false gem 'metadata-json-lint', :require => false end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index cf5db0b..41dd7da 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,8 +1,6 @@ require 'puppetlabs_spec_helper/module_spec_helper' -require 'puppet_facts' -include PuppetFacts - -ENV['UNIT_TEST_PLATFORMS'] = 'debian-7-x86_64' +require 'rspec-puppet-facts' +include RspecPuppetFacts RSpec.configure do |c| |