diff options
author | Hunter Haugen <hunter@puppetlabs.com> | 2014-06-19 16:25:16 -0700 |
---|---|---|
committer | Hunter Haugen <hunter@puppetlabs.com> | 2014-06-19 16:25:16 -0700 |
commit | 4523bc50ca4eaac2f4a8d2840d1d13ec68742ab0 (patch) | |
tree | fb3b511665dd8b7e4555e4f1c803202932de119e /spec/functions/loadyaml_spec.rb | |
parent | 7d4fa05da13577072defe991b9de8b96ac4c3be7 (diff) | |
parent | ffe21fc67491c4502114505c82142781d72720ab (diff) | |
download | puppet-stdlib-4523bc50ca4eaac2f4a8d2840d1d13ec68742ab0.tar.gz puppet-stdlib-4523bc50ca4eaac2f4a8d2840d1d13ec68742ab0.tar.bz2 |
Merge branch 'master' into 4.3.x
Diffstat (limited to 'spec/functions/loadyaml_spec.rb')
-rwxr-xr-x | spec/functions/loadyaml_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/functions/loadyaml_spec.rb b/spec/functions/loadyaml_spec.rb index fe16318..cdc3d6f 100755 --- a/spec/functions/loadyaml_spec.rb +++ b/spec/functions/loadyaml_spec.rb @@ -7,7 +7,7 @@ describe "the loadyaml function" do let(:scope) { PuppetlabsSpec::PuppetInternals.scope } it "should exist" do - Puppet::Parser::Functions.function("loadyaml").should == "function_loadyaml" + expect(Puppet::Parser::Functions.function("loadyaml")).to eq("function_loadyaml") end it "should raise a ParseError if there is less than 1 arguments" do @@ -20,6 +20,6 @@ describe "the loadyaml function" do fh.write("---\n aaa: 1\n bbb: 2\n ccc: 3\n ddd: 4\n") end result = scope.function_loadyaml([yaml_file]) - result.should == {"aaa" => 1, "bbb" => 2, "ccc" => 3, "ddd" => 4 } + expect(result).to eq({"aaa" => 1, "bbb" => 2, "ccc" => 3, "ddd" => 4 }) end end |