Fix rspec tests with rspec-puppet

Prior to this commit, tests in master were broken due to changes
in rspec puppet. The last working version for the previous code
to successfully test on was rspec-puppet 2.6.11.

This commit updates the spec tests to work with 2.6.12 and 2.6.13

Author: austb

spec/unit/classes/master/report_processor_spec.rb

@@ -1,6 +1,13 @@
 require 'spec_helper'
 
 describe 'puppetdb::master::report_processor', :type => :class do
+  around(:each) do |example|
+    confdir = RSpec.configuration.confdir
+    RSpec.configuration.confdir = '/etc/puppet'
+    example.run
+    RSpec.configuration.confdir = confdir
+  end
+
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do

spec/unit/classes/server/command_processing_spec.rb

@@ -9,6 +9,8 @@
       }
     end
 
+    let(:pre_condition) { 'include puppetdb::server::global' }
+
     it { should contain_class('puppetdb::server::command_processing') }
 
     describe 'when using default values' do
@@ -43,7 +45,13 @@
     end
 
     describe 'when using legacy PuppetDB' do
-      let (:pre_condition) { 'class { "puppetdb::globals": version => "2.2.0", }' }
+      let (:pre_condition) do
+        [
+          'class { "puppetdb::globals": version => "2.2.0", }',
+          super(),
+        ].join("\n")
+      end
+
       it { should contain_ini_setting('puppetdb_command_processing_threads').
         with(
              'ensure'  => 'absent',