Commit 1e6a4ae0 authored by Mickaël Canévet's avatar Mickaël Canévet
Browse files

Update with modulesync

parent 1b7f41fa

.travis.yml

+1 −6
Changes for .travis.yml: 1 added line, 6 removed lines.
Original line number Diff line number Diff line
@@ -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:

Gemfile

+1 −1
Changes for Gemfile: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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

spec/spec_helper.rb

+2 −4
Changes for spec/spec_helper.rb: 2 added lines, 4 removed lines.
Original line number Diff line number Diff line 
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|