Skip to content

Commit c3f4f51

Browse files
committed
Minor fixes to tests for when A= is used w/ minitest runs.
[git-p4: depot-paths = "//src/hoe/dev/": change = 14577]
1 parent 0c56846 commit c3f4f51

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

test/test_hoe_test.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,22 @@ def test_globs
2828

2929
MT_EXPECTED = %W[-I#{mt_path} -w
3030
-e '%srequire "test/test_hoe_test.rb"'
31-
--].join(" ") + " "
31+
-- %s].join(" ")
3232

3333
def test_make_test_cmd_for_minitest
34-
skip "Using TESTOPTS... skipping" if ENV["TESTOPTS"]
35-
3634
framework = %(require "minitest/autorun"; )
3735

3836
@tester = Minitest::TestTask.create :testtest do |t|
3937
t.libs += Hoe.include_dirs.uniq
4038
t.test_globs = ["test/test_hoe_test.rb"]
4139
end
4240

43-
assert_equal MT_EXPECTED % [framework].join("; "), @tester.make_test_cmd
41+
fw = [framework].join("; ")
42+
env = ENV["A"]
43+
assert_equal MT_EXPECTED % [fw, env], @tester.make_test_cmd
4444
end
4545

4646
def test_make_test_cmd_for_minitest_prelude
47-
skip "Using TESTOPTS... skipping" if ENV["TESTOPTS"]
48-
4947
prelude = %(require "other/file")
5048
framework = %(require "minitest/autorun"; )
5149

@@ -55,6 +53,8 @@ def test_make_test_cmd_for_minitest_prelude
5553
t.test_globs = ["test/test_hoe_test.rb"]
5654
end
5755

58-
assert_equal MT_EXPECTED % [prelude, framework].join("; "), @tester.make_test_cmd
56+
prelude = [prelude, framework].join("; ")
57+
env = ENV["A"]
58+
assert_equal MT_EXPECTED % [prelude, env], @tester.make_test_cmd
5959
end
6060
end

0 commit comments

Comments
 (0)