Make the rspec test pass on 4.0

Author: stephenrjohnson

.fixtures.yml

@@ -3,13 +3,13 @@ fixtures:
         stdlib:  "git://github.com/puppetlabs/puppetlabs-stdlib.git"
         apache:
           repo: "git://github.com/puppetlabs/puppetlabs-apache.git"
-          ref: '1.0.1'
         puppetdb: "git://github.com/puppetlabs/puppetlabs-puppetdb.git"
         inifile: "git://github.com/puppetlabs/puppetlabs-inifile.git"
         concat: "git://github.com/ripienaar/puppet-concat.git"
-        'file_concat':
+        file_concat:
           repo: 'git://github.com/electrical/puppet-lib-file_concat.git'
-          ref: '1.0.1'
-        apt: "git://github.com/puppetlabs/puppetlabs-apt.git"
+        apt:
+          repo: "git://github.com/puppetlabs/puppetlabs-apt"
+          ref: "1.8.0"
     symlinks:
         puppet: "#{source_dir}"

spec/classes/puppet_master_spec.rb

@@ -72,10 +72,10 @@
                 :notify => 'Service[httpd]'
             )
             should contain_class('puppet::storeconfigs').with(
-              :before => 'Anchor[puppet::master::end]'
+              :before => ['Anchor[puppet::master::end]']
             )
             should contain_class('puppet::passenger').with(
-              :before => 'Anchor[puppet::master::end]'
+              :before => ['Anchor[puppet::master::end]']
             )
             should contain_ini_setting('puppetmasterenvironmentpath').with(
                 :ensure  => 'absent',
@@ -240,10 +240,10 @@
                 :notify => 'Service[httpd]'
             )
             should contain_class('puppet::storeconfigs').with(
-              :before => 'Anchor[puppet::master::end]'
+              :before => ['Anchor[puppet::master::end]']
             )
             should contain_class('puppet::passenger').with(
-              :before => 'Anchor[puppet::master::end]'
+              :before => ['Anchor[puppet::master::end]']
             )
             should contain_ini_setting('puppetmasterenvironmentpath').with(
                 :ensure  => 'absent'

spec/classes/puppet_passenger_spec.rb

@@ -10,7 +10,7 @@
                 :puppet_ssldir          => '/var/lib/puppet/ssl',
                 :certname               => 'test.test.com',
                 :conf_dir               => '/etc/puppet',
-                :dns_alt_names          => ['puppet'],
+                :dns_alt_names          => 'puppet',
         }
         end
     context 'on Debian' do
@@ -30,7 +30,7 @@
                 should contain_exec('Certificate_Check').with(
                     :command =>
                       "puppet cert clean #{params[:certname]} ; " +
-                      "puppet certificate --ca-location=local --dns_alt_names=#{params[:dns_alt_names].join(',')} generate #{params[:certname]}" +
+                      "puppet certificate --ca-location=local --dns_alt_names=#{params[:dns_alt_names]} generate #{params[:certname]}" +
                       " && puppet cert sign --allow-dns-alt-names #{params[:certname]}" +
                       " && puppet certificate --ca-location=local find #{params[:certname]}",
                     :unless  => "/bin/ls #{params[:puppet_ssldir]}/certs/#{params[:certname]}.pem",