summaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
authorMarkus Roberts <Markus@reality.com>2010-09-30 17:21:56 -0700
committerMarkus Roberts <Markus@reality.com>2010-09-30 17:21:56 -0700
commitbdf12fec365151fb049f7875aa82f2d207f0d8a0 (patch)
tree638b7393ba37c63d813092427f5cd07342763b85 /spec
parente7424c69822a91360c94469dfef4ccddda7f6d25 (diff)
downloadpuppet-bdf12fec365151fb049f7875aa82f2d207f0d8a0.tar.gz
puppet-bdf12fec365151fb049f7875aa82f2d207f0d8a0.tar.xz
puppet-bdf12fec365151fb049f7875aa82f2d207f0d8a0.zip
Fix for #4896 -- stray newline left over from removed diagnostic
A newline that was part of a diagnostic was left in, and this caused problems with the serialization of strings in "preserve newlines" mode.
Diffstat (limited to 'spec')
-rwxr-xr-x[-rw-r--r--]spec/unit/util/zaml_spec.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/unit/util/zaml_spec.rb b/spec/unit/util/zaml_spec.rb
index 4de57e6d3..f2bcefe01 100644..100755
--- a/spec/unit/util/zaml_spec.rb
+++ b/spec/unit/util/zaml_spec.rb
@@ -11,7 +11,8 @@ describe "Pure ruby yaml implementation" do
'test' => "--- test",
[] => "--- []",
:symbol => "--- !ruby/sym symbol",
- {:a => "A"} => "--- \n !ruby/sym a: A"
+ {:a => "A"} => "--- \n !ruby/sym a: A",
+ {:a => "x\ny"} => "--- \n !ruby/sym a: |-\n x\n y"
}.each { |o,y|
it "should convert the #{o.class} #{o.inspect} to yaml" do
o.to_yaml.should == y