summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRyan Davis <ryand@zenspider.com>2020-02-09 03:26:49 -0800
committerRyan Davis <ryand@zenspider.com>2020-02-09 03:26:49 -0800
commit9b07634d46a3a6a77649c27df8fa7321c498b9de (patch)
treeb7036cbfce8ecaa22f0e782aeb3e1ce1f3376e7e /lib
parentdd845b9d716ff80392b1dd593c54b64e232b8ce5 (diff)
downloadhoe-9b07634d46a3a6a77649c27df8fa7321c498b9de.tar.gz
- Fixed wiring of test_prelude into Minitest::TestTask.create. (flavorjones)
- Fixed ordering of test_prelude vs framework in Minitest::TestTask. (flavorjones) [git-p4: depot-paths = "//src/hoe/dev/": change = 12538]
Diffstat (limited to 'lib')
-rw-r--r--lib/hoe/test.rb3
-rw-r--r--lib/minitest/test_task.rb2
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/hoe/test.rb b/lib/hoe/test.rb
index a0432c9..af9ddbc 100644
--- a/lib/hoe/test.rb
+++ b/lib/hoe/test.rb
@@ -80,8 +80,9 @@ module Hoe::Test
when :minitest then
require "minitest/test_task" # currently in hoe, but will move
+ test_prelude = self.test_prelude
Minitest::TestTask.create :test do |t|
- t.test_prelude = self.test_prelude
+ t.test_prelude = test_prelude
t.libs += Hoe.include_dirs.uniq
end
when :testunit then
diff --git a/lib/minitest/test_task.rb b/lib/minitest/test_task.rb
index 5ead3da..9c2e5d7 100644
--- a/lib/minitest/test_task.rb
+++ b/lib/minitest/test_task.rb
@@ -259,8 +259,8 @@ module Minitest # :nodoc:
tests.map! { |f| %(require "#{f}") }
runner = []
- runner << framework
runner << test_prelude if test_prelude
+ runner << framework
runner.concat tests
runner = runner.join "; "