diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-03-22 11:41:53 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-03-22 11:41:53 -0700 |
| commit | 6bf5b7fea8ef4d04809e78eef84029a0773d4747 (patch) | |
| tree | cc264fef5811c7d5e8000bc4048bab86b87064a0 /spec/unit/network | |
| parent | e80063468e404a6827ea6ec458ae34ca84619eed (diff) | |
| parent | f6da3339f59bbd9243a03dc1e417b1fed7955c7e (diff) | |
| download | puppet-6bf5b7fea8ef4d04809e78eef84029a0773d4747.tar.gz puppet-6bf5b7fea8ef4d04809e78eef84029a0773d4747.tar.xz puppet-6bf5b7fea8ef4d04809e78eef84029a0773d4747.zip | |
Merge branch 'ticket/next/maint-fix_require_spec_helper_for_ruby_19' into next
* ticket/next/maint-fix_require_spec_helper_for_ruby_19:
maint: Change code for finding spec_helper to work with Ruby 1.9
Fix error "invalid multibyte char (US-ASCII)" under Ruby 1.9
Diffstat (limited to 'spec/unit/network')
| -rw-r--r-- | spec/unit/network/http/api/v1_spec.rb | 2 | ||||
| -rwxr-xr-x | spec/unit/network/xmlrpc/client_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/unit/network/http/api/v1_spec.rb b/spec/unit/network/http/api/v1_spec.rb index 25f6d8fe2..257eec5de 100644 --- a/spec/unit/network/http/api/v1_spec.rb +++ b/spec/unit/network/http/api/v1_spec.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") } +require File.expand_path(File.dirname(__FILE__) + '/../../../../spec_helper') require 'puppet/network/http/api/v1' diff --git a/spec/unit/network/xmlrpc/client_spec.rb b/spec/unit/network/xmlrpc/client_spec.rb index 8440d39fa..7498ca4cf 100755 --- a/spec/unit/network/xmlrpc/client_spec.rb +++ b/spec/unit/network/xmlrpc/client_spec.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby require 'puppet/network/client' -Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") } +require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper') describe Puppet::Network::XMLRPCClient do describe "when performing the rpc call" do |