diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2010-12-06 12:01:18 -0800 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2010-12-06 12:01:18 -0800 |
| commit | 626d7564467bdc0e9d2d385e9aa10c539d9ed175 (patch) | |
| tree | bff625caf757ccd42b3e8dd902214531efb41fdf /spec/unit/provider/user | |
| parent | b9f3847cd2c7efb954f428224d8d721f9edafd64 (diff) | |
| download | puppet-626d7564467bdc0e9d2d385e9aa10c539d9ed175.tar.gz puppet-626d7564467bdc0e9d2d385e9aa10c539d9ed175.tar.xz puppet-626d7564467bdc0e9d2d385e9aa10c539d9ed175.zip | |
maint: Use expand_path when requiring spec_helper or puppettest
Doing a require to a relative path can cause files to be required more
than once when they're required from different relative paths. If you
expand the path fully, this won't happen. Ruby 1.9 also requires that
you use expand_path when doing these requires.
Paired-with: Jesse Wolfe
Diffstat (limited to 'spec/unit/provider/user')
| -rwxr-xr-x | spec/unit/provider/user/hpux_spec.rb | 2 | ||||
| -rwxr-xr-x | spec/unit/provider/user/ldap_spec.rb | 2 | ||||
| -rw-r--r-- | spec/unit/provider/user/user_role_add_spec.rb | 2 | ||||
| -rwxr-xr-x | spec/unit/provider/user/useradd_spec.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/spec/unit/provider/user/hpux_spec.rb b/spec/unit/provider/user/hpux_spec.rb index f53f6c31e..b10f2847c 100755 --- a/spec/unit/provider/user/hpux_spec.rb +++ b/spec/unit/provider/user/hpux_spec.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -require File.dirname(__FILE__) + '/../../../spec_helper' +require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper') provider_class = Puppet::Type.type(:user).provider(:hpuxuseradd) diff --git a/spec/unit/provider/user/ldap_spec.rb b/spec/unit/provider/user/ldap_spec.rb index b6635705d..5b2dc98b5 100755 --- a/spec/unit/provider/user/ldap_spec.rb +++ b/spec/unit/provider/user/ldap_spec.rb @@ -3,7 +3,7 @@ # Created by Luke Kanies on 2008-3-10. # Copyright (c) 2006. All rights reserved. -require File.dirname(__FILE__) + '/../../../spec_helper' +require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper') provider_class = Puppet::Type.type(:user).provider(:ldap) diff --git a/spec/unit/provider/user/user_role_add_spec.rb b/spec/unit/provider/user/user_role_add_spec.rb index 9cf649267..9cd0feb12 100644 --- a/spec/unit/provider/user/user_role_add_spec.rb +++ b/spec/unit/provider/user/user_role_add_spec.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -require File.dirname(__FILE__) + '/../../../spec_helper' +require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper') provider_class = Puppet::Type.type(:user).provider(:user_role_add) diff --git a/spec/unit/provider/user/useradd_spec.rb b/spec/unit/provider/user/useradd_spec.rb index 9ebba596c..f9babe6aa 100755 --- a/spec/unit/provider/user/useradd_spec.rb +++ b/spec/unit/provider/user/useradd_spec.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -require File.dirname(__FILE__) + '/../../../spec_helper' +require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper') provider_class = Puppet::Type.type(:user).provider(:useradd) |