diff options
author | Jeff McCune <jeff@puppetlabs.com> | 2012-11-19 11:23:50 -0500 |
---|---|---|
committer | Jeff McCune <jeff@puppetlabs.com> | 2012-11-19 11:23:50 -0500 |
commit | 326a13908ba8a725a85330d040e3c5cc0b211524 (patch) | |
tree | 7de72ae30323b32c529b9a1e34e27277ca1afe85 /spec | |
parent | f40bb1e28808f346ce44c9197549681165fe233f (diff) | |
parent | 88acc523931272deb57eafbb7021f8d32248d68e (diff) |
Merge branch 'jfryman-master'
* jfryman-master:
puppet-lint cleanup
Diffstat (limited to 'spec')
4 files changed, 1 insertions, 4 deletions
diff --git a/spec/monkey_patches/publicize_methods.rb b/spec/monkey_patches/publicize_methods.rb index b39e9c0..f3a1abf 100755 --- a/spec/monkey_patches/publicize_methods.rb +++ b/spec/monkey_patches/publicize_methods.rb @@ -8,4 +8,3 @@ class Class self.class_eval { private(*saved_private_instance_methods) } end end - diff --git a/spec/unit/puppet/parser/functions/fqdn_rotate_spec.rb b/spec/unit/puppet/parser/functions/fqdn_rotate_spec.rb index 4eb799d..2577723 100644 --- a/spec/unit/puppet/parser/functions/fqdn_rotate_spec.rb +++ b/spec/unit/puppet/parser/functions/fqdn_rotate_spec.rb @@ -19,7 +19,7 @@ describe "the fqdn_rotate function" do end it "should rotate a string to give the same results for one host" do - scope.expects(:lookupvar).with("::fqdn").returns("127.0.0.1").twice + scope.expects(:lookupvar).with("::fqdn").returns("127.0.0.1").twice scope.function_fqdn_rotate(["abcdefg"]).should eql(scope.function_fqdn_rotate(["abcdefg"])) end diff --git a/spec/unit/puppet/parser/functions/validate_hash_spec.rb b/spec/unit/puppet/parser/functions/validate_hash_spec.rb index f63db1d..06d77a1 100644 --- a/spec/unit/puppet/parser/functions/validate_hash_spec.rb +++ b/spec/unit/puppet/parser/functions/validate_hash_spec.rb @@ -41,4 +41,3 @@ describe Puppet::Parser::Functions.function(:validate_hash) do end end - diff --git a/spec/unit/puppet/parser/functions/validate_string_spec.rb b/spec/unit/puppet/parser/functions/validate_string_spec.rb index f40bf2a..007b4ca 100644 --- a/spec/unit/puppet/parser/functions/validate_string_spec.rb +++ b/spec/unit/puppet/parser/functions/validate_string_spec.rb @@ -58,4 +58,3 @@ describe Puppet::Parser::Functions.function(:validate_string) do end end end - |