diff --git a/Gemfile b/Gemfile index 3ce6e2bce18b5907feb5959e451f98cb8c255733..3a0081c49af6e72cf6cfb682cfc3678caac52b2e 100644 --- a/Gemfile +++ b/Gemfile @@ -3,22 +3,12 @@ source 'https://rubygems.org' if ENV.key?('PUPPET_VERSION') puppetversion = "~> #{ENV['PUPPET_VERSION']}" else - puppetversion = ['>= 3.8.7'] + puppetversion = ['>= 7.0'] end -if RUBY_VERSION == '1.8.7' - # 4.0.0 requires 1.9.3 - puppetversion = ['~> 3.8.7'] - gem 'i18n', '~> 0.6.11' - gem 'activesupport', '~> 3.2' - gem 'librarian-puppet', '~> 1.0.0' - gem 'highline', '~> 1.6.21' - gem 'rake', '< 11' - gem 'json', '< 2.0.2' -else - gem 'rake' - gem 'librarian-puppet', '>=0.9.10' -end +gem 'rake' +gem 'librarian-puppet', '>=0.9.10' gem 'puppet', puppetversion +gem 'base32' gem 'puppet-lint', '>=0.3.2' gem 'puppetlabs_spec_helper', '>=0.2.0' diff --git a/spec/defines/list_spec.rb b/spec/defines/list_spec.rb index 5a3254c980ba3c60898c91f249234bdb40f64c4d..b8f1fb82daa0c5af572cb81f071ead6040971301 100644 --- a/spec/defines/list_spec.rb +++ b/spec/defines/list_spec.rb @@ -13,7 +13,8 @@ describe 'schleuder::list', :type => 'define' do } let(:title){ 'somelist@example.com' } let(:params){ { - :admin => 'admin@example.com' + :admin => 'admin@example.com', + :admin_publickey => 'bla', } } context 'default' do it { is_expected.to compile.with_all_deps }