summaryrefslogtreecommitdiffstats
path: root/autotest/puppet_rspec.rb
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2008-02-19 15:32:30 +1100
committerJames Turnbull <james@lovedthanlost.net>2008-02-19 15:32:30 +1100
commit95b8414b8164b1beffea20973e204b1b5cbba763 (patch)
tree775a00896d2a4281f9cd3ae92b21d95f51307862 /autotest/puppet_rspec.rb
parentd82bfd86288cc012018797d98168f918bff75778 (diff)
parent39f9818276e49020c1a6db9667371f7617d5cc93 (diff)
downloadpuppet-95b8414b8164b1beffea20973e204b1b5cbba763.tar.gz
puppet-95b8414b8164b1beffea20973e204b1b5cbba763.tar.xz
puppet-95b8414b8164b1beffea20973e204b1b5cbba763.zip
Merge branch '0.24.x' of git://reductivelabs.com/puppet into 0.24.x
Diffstat (limited to 'autotest/puppet_rspec.rb')
-rw-r--r--autotest/puppet_rspec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/autotest/puppet_rspec.rb b/autotest/puppet_rspec.rb
index bfc1a6a43..5ff794e9d 100644
--- a/autotest/puppet_rspec.rb
+++ b/autotest/puppet_rspec.rb
@@ -51,9 +51,9 @@ class Autotest::PuppetRspec < Autotest::Rspec
# * our local vendor/gems/rspec/bin/spec
def spec_commands
[
+ File.join('vendor', 'gems', 'rspec', 'bin', 'spec') ,
File.join('bin', 'spec'),
- File.join(Config::CONFIG['bindir'], 'spec'),
- File.join('vendor', 'gems', 'rspec', 'bin', 'spec')
+ File.join(Config::CONFIG['bindir'], 'spec')
]
end