diff options
| author | John Keiser <jkeiser@opscode.com> | 2014-05-05 16:47:11 -0700 |
|---|---|---|
| committer | John Keiser <jkeiser@opscode.com> | 2014-05-05 16:47:11 -0700 |
| commit | 385f993a73726d9e1bfbfcf3454b7f246ba542c6 (patch) | |
| tree | 810b52d96525563250e15af8f588a23a0a0d1cc6 /spec/integration/recipes | |
| parent | a81731b538b50a112712c463255bb52fa592ae68 (diff) | |
| download | chef-385f993a73726d9e1bfbfcf3454b7f246ba542c6.tar.gz | |
Fix issue with tests and Windows line endings
Diffstat (limited to 'spec/integration/recipes')
| -rw-r--r-- | spec/integration/recipes/lwrp_inline_resources_spec.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/spec/integration/recipes/lwrp_inline_resources_spec.rb b/spec/integration/recipes/lwrp_inline_resources_spec.rb index dca5713ace..df666eaaa9 100644 --- a/spec/integration/recipes/lwrp_inline_resources_spec.rb +++ b/spec/integration/recipes/lwrp_inline_resources_spec.rb @@ -57,7 +57,8 @@ log_level :warn EOM result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" --no-color -F doc -o 'x::default'", :cwd => chef_dir) - result.stdout.should include(<<EOM) + actual = result.stdout.lines.map { |l| l.chomp }.join("\n") + expected = <<EOM * x_my_machine[me] action create * x_do_nothing[a] action create (up to date) * x_do_nothing[b] action create (up to date) @@ -67,6 +68,8 @@ EOM * x_do_nothing[b] action create (up to date) (up to date) EOM + expected = expected.lines.map { |l| l.chomp }.join("\n") + actual.should include(expected) result.error! end end |