Merge pull request #227 from mhaskel/moar_test_fixes

Windows and solaris fixes

spec/acceptance/concat_spec.rb

@@ -13,7 +13,7 @@ when 'windows'
   username   = 'Administrator'
   groupname  = 'Administrators'
   scriptname = 'concatfragments.rb'
-when 'solaris'
+when 'Solaris'
   username   = 'root'
   groupname  = 'root'
   scriptname = 'concatfragments.rb'

spec/acceptance/newline_spec.rb

@@ -59,7 +59,9 @@ describe 'concat ensure_newline parameter' do
 
     describe file("#{basedir}/file") do
       it { should be_file }
-      it { should contain "1\n2\n" }
+      it("should contain 1\n2\n", :unless => (fact('osfamily') == 'Solaris')) {
+        should contain "1\n2\n"
+      }
     end
   end
 end

spec/acceptance/quoted_paths_spec.rb

@@ -36,7 +36,9 @@ describe 'quoted paths' do
 
     describe file("#{basedir}/concat test/foo") do
       it { should be_file }
-      it { should contain "string1\nsring2" }
+      it("should contain string1\nstring2", :unless => (fact('osfamily') == 'Solaris')) {
+        should contain "string1\nstring2"
+      }
     end
   end
 end

spec/spec_helper_acceptance.rb

@@ -25,8 +25,11 @@ RSpec.configure do |c|
     # Install module and dependencies
     hosts.each do |host|
       on host, "mkdir -p #{host['distmoduledir']}/concat"
+      result = on host, "echo #{host['distmoduledir']}/concat"
+      target = result.raw_output.chomp
+
       %w(files lib manifests metadata.json).each do |file|
-        scp_to host, "#{proj_root}/#{file}", "#{host['distmoduledir']}/concat"
+        scp_to host, "#{proj_root}/#{file}", target
       end
       #copy_module_to(host, :source => proj_root, :module_name => 'concat')
       on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }