Merge pull request #80 from jeffmccune/fix/2.3.x/go_green

Fix up 2.3.x for new scope

1 files changed, 7 insertions, 13 deletions

diff --git a/spec/unit/puppet/parser/functions/str2saltedsha512_spec.rb b/spec/unit/puppet/parser/functions/str2saltedsha512_spec.rb
index 11485aa..a692c31 100644
--- a/spec/unit/puppet/parser/functions/str2saltedsha512_spec.rb
+++ b/spec/unit/puppet/parser/functions/str2saltedsha512_spec.rb
@@ -1,39 +1,33 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 describe "the str2saltedsha512 function" do
-  before :all do
-    Puppet::Parser::Functions.autoloader.loadall
-  end
-
-  before :each do
-    @scope = Puppet::Parser::Scope.new
-  end
+  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
 
   it "should exist" do
     Puppet::Parser::Functions.function("str2saltedsha512").should == "function_str2saltedsha512"
   end
 
   it "should raise a ParseError if there is less than 1 argument" do
-    expect { @scope.function_str2saltedsha512([]) }.should( raise_error(Puppet::ParseError) )
+    expect { scope.function_str2saltedsha512([]) }.should( raise_error(Puppet::ParseError) )
   end
 
   it "should raise a ParseError if there is more than 1 argument" do
-    expect { @scope.function_str2saltedsha512(['foo', 'bar', 'baz']) }.should( raise_error(Puppet::ParseError) )
+    expect { scope.function_str2saltedsha512(['foo', 'bar', 'baz']) }.should( raise_error(Puppet::ParseError) )
   end
 
   it "should return a salted-sha512 password hash 136 characters in length" do
-    result = @scope.function_str2saltedsha512(["password"])
+    result = scope.function_str2saltedsha512(["password"])
     result.length.should(eq(136))
   end
 
   it "should raise an error if you pass a non-string password" do
-    expect { @scope.function_str2saltedsha512([1234]) }.should( raise_error(Puppet::ParseError) )
+    expect { scope.function_str2saltedsha512([1234]) }.should( raise_error(Puppet::ParseError) )
   end
 
   it "should generate a valid password" do
     # Allow the function to generate a password based on the string 'password'
-    password_hash = @scope.function_str2saltedsha512(["password"])
+    password_hash = scope.function_str2saltedsha512(["password"])
 
     # Separate the Salt and Password from the Password Hash
     salt     = password_hash[0..7]