Unverified Commit d9321927 authored by Tim Meusel's avatar Tim Meusel Committed by GitHub
Browse files

Merge pull request #365 from voxpupuli/revert-363-augeas-module-cleanup 

Revert "Remove camptocamp/puppet-augeas dependency"
parents 75632c3f 006b7f0e

.fixtures.yml

+1 −0
Original line number Diff line number Diff line
@@ -3,5 +3,6 @@ fixtures: 
  repositories:

    stdlib: https://github.com/puppetlabs/puppetlabs-stdlib.git

    concat: https://github.com/voxpupuli/puppet-alternatives.git

    augeas: https://github.com/camptocamp/puppet-augeas.git

    mailalias_core: https://github.com/puppetlabs/puppetlabs-mailalias_core.git

    augeas_core: https://github.com/puppetlabs/puppetlabs-augeas_core.git

README.md

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
* FreeBSD



## Dependencies

  - [camptocamp-augeas 1.0.0+](https://github.com/camptocamp/puppet-augeas)

  - [puppet-alternatives 2.0.0+](https://github.com/voxpupuli/puppet-alternatives)

  - [puppetlabs-mailalias_core 1.0.5+](https://github.com/puppetlabs/puppetlabs-mailalias_core)

  - [puppetlabs-stdlib 4.13.0+](https://github.com/puppetlabs/puppetlabs-stdlib)

metadata.json

+4 −0
Original line number Diff line number Diff line
@@ -12,6 +12,10 @@ 
      "name": "puppetlabs/stdlib",

      "version_requirement": ">= 4.13.0 < 10.0.0"

    },

    {

      "name": "camptocamp/augeas",

      "version_requirement": ">= 1.0.0 < 2.0.0"

    },

    {

      "name": "puppet/alternatives",

      "version_requirement": ">= 2.0.0 < 6.0.0"

spec/classes/postfix_spec.rb

+3 −0
Original line number Diff line number Diff line
@@ -530,6 +530,9 @@ describe 'postfix' do 


      context 'when specifying satellite' do # rubocop:disable RSpec/MultipleMemoizedHelpers

        let(:params) { { satellite: true, mydestination: '1.2.3.4', relayhost: '2.3.4.5' } }

        let :pre_condition do

          "class { 'augeas': }"

        end



        it 'compiles with expected resources' do

          is_expected.to compile.with_all_deps

spec/defines/postfix_transport_spec.rb

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ describe 'postfix::transport' do 


  let :pre_condition do

    <<-EOT

    class { '::augeas': }

    class { '::postfix': }

    EOT

  end