Skip to content

Commit

Permalink
Merge pull request #55 from reijop/master
Browse files Browse the repository at this point in the history
fixes scratch_dir not found error
  • Loading branch information
dpetzel committed Oct 30, 2013
2 parents d5c23f8 + e854398 commit 737f44b
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
32 changes: 16 additions & 16 deletions Berksfile.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sources": {
"minitest-handler": {
"path": "."
},
"minitest-handler_test1": {
"path": "./test/cookbooks/minitest-handler_test1"
},
"minitest-handler_test2": {
"path": "./test/cookbooks/minitest-handler_test2"
},
"chef_handler": {
"locked_version": "1.0.8"
}
}
}
{
"sources": {
"minitest-handler": {
"path": "."
},
"minitest-handler_test1": {
"path": "./test/cookbooks/minitest-handler_test1"
},
"minitest-handler_test2": {
"path": "./test/cookbooks/minitest-handler_test2"
},
"chef_handler": {
"locked_version": "1.0.8"
}
}
}
4 changes: 2 additions & 2 deletions libraries/test_loader.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module MinitestHandler
module CookbookHelper

# Load necessary tests onto the filesystem
def load_tests
def load_tests(scratch_dir)
require 'fileutils'

unless node[:minitest][:recipes].empty?
Expand Down Expand Up @@ -115,4 +115,4 @@ def load_tests
Chef::Config.send("report_handlers") << handler
end
end
end
end
2 changes: 1 addition & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
license "Apache 2.0"
description "Installs and configures minitest-chef-handler"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version "1.1.1"
version "1.1.2"

depends "chef_handler"
2 changes: 1 addition & 1 deletion recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ class Chef::Resource::RubyBlock
ruby_block "load tests" do
block do
# Leverage the library code to load the test files
load_tests()
load_tests(scratch_dir)
end
end

0 comments on commit 737f44b

Please sign in to comment.