X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Facceptance%2Fvalidate_cmd_spec.rb;h=a846b53554468457491b4f5408c37f59ec94b7d2;hb=6f656bd4265e3dab13b9af2bf96e9044322e9d8f;hp=5ac66fdbff4c7ebbee538f10cb613a405113f0ef;hpb=ad88f67c13ae0f1a08936dad643f1e3509ab5f40;p=mirror%2Fdsa-puppet.git diff --git a/3rdparty/modules/stdlib/spec/acceptance/validate_cmd_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/validate_cmd_spec.rb old mode 100755 new mode 100644 index 5ac66fdbf..a846b5355 --- a/3rdparty/modules/stdlib/spec/acceptance/validate_cmd_spec.rb +++ b/3rdparty/modules/stdlib/spec/acceptance/validate_cmd_spec.rb @@ -1,10 +1,8 @@ -#! /usr/bin/env ruby -S rspec require 'spec_helper_acceptance' -describe 'validate_cmd function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do +describe 'validate_cmd function' do describe 'success' do - it 'validates a true command' do - pp = <<-EOS + pp1 = <<-DOC $one = 'foo' if $::osfamily == 'windows' { $two = 'echo' #shell built-in @@ -12,12 +10,12 @@ describe 'validate_cmd function', :unless => UNSUPPORTED_PLATFORMS.include?(fact $two = '/bin/echo' } validate_cmd($one,$two) - EOS - - apply_manifest(pp, :catch_failures => true) + DOC + it 'validates a true command' do + apply_manifest(pp1, :catch_failures => true) end - it 'validates a fail command' do - pp = <<-EOS + + pp2 = <<-DOC $one = 'foo' if $::osfamily == 'windows' { $two = 'C:/aoeu' @@ -25,12 +23,12 @@ describe 'validate_cmd function', :unless => UNSUPPORTED_PLATFORMS.include?(fact $two = '/bin/aoeu' } validate_cmd($one,$two) - EOS - - apply_manifest(pp, :expect_failures => true) + DOC + it 'validates a fail command' do + apply_manifest(pp2, :expect_failures => true) end - it 'validates a fail command with a custom error message' do - pp = <<-EOS + + pp3 = <<-DOC $one = 'foo' if $::osfamily == 'windows' { $two = 'C:/aoeu' @@ -38,10 +36,10 @@ describe 'validate_cmd function', :unless => UNSUPPORTED_PLATFORMS.include?(fact $two = '/bin/aoeu' } validate_cmd($one,$two,"aoeu is dvorak") - EOS - - apply_manifest(pp, :expect_failures => true) do |output| - expect(output.stderr).to match(/aoeu is dvorak/) + DOC + it 'validates a fail command with a custom error message' do + apply_manifest(pp3, :expect_failures => true) do |output| + expect(output.stderr).to match(%r{aoeu is dvorak}) end end end