summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-10 01:55:38 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-10 01:55:38 +0000
commit989f5a1e6fc2074158456e70529002cb5e4d29d0 (patch)
tree5dae5687c2b9a215475ab5cb6695807986d92d1d
parent352010845b3c0294d9ecd14dd392fd0670d54ba6 (diff)
test/minitest: Correct requiring path to metametameta.rb.
* test/minitest/test_minitest_mock.rb: Correct requiring path to metametameta.rb. * test/minitest/test_minitest_unit.rb: Correct requiring path to metametameta.rb. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35609 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--test/minitest/test_minitest_mock.rb2
-rw-r--r--test/minitest/test_minitest_unit.rb2
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0e010d99f77..b480363f05d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu May 10 10:55:35 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/minitest/test_minitest_mock.rb: Correct requiring path to
+ metametameta.rb.
+
+ * test/minitest/test_minitest_unit.rb: Correct requiring path to
+ metametameta.rb.
+
Thu May 10 10:18:10 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (lex_state_name): returns name for lex_state_e, for debug
diff --git a/test/minitest/test_minitest_mock.rb b/test/minitest/test_minitest_mock.rb
index dcb140851a7..87774c9ebb3 100644
--- a/test/minitest/test_minitest_mock.rb
+++ b/test/minitest/test_minitest_mock.rb
@@ -211,7 +211,7 @@ class TestMiniTestMock < MiniTest::Unit::TestCase
end
end
-require "test/minitest/metametameta"
+require "metametameta"
class TestMiniTestStub < MiniTest::Unit::TestCase
def setup
diff --git a/test/minitest/test_minitest_unit.rb b/test/minitest/test_minitest_unit.rb
index e13890f32f7..27132515efa 100644
--- a/test/minitest/test_minitest_unit.rb
+++ b/test/minitest/test_minitest_unit.rb
@@ -6,7 +6,7 @@
######################################################################
require 'pathname'
-require 'test/minitest/metametameta'
+require 'metametameta'
module MyModule; end
class AnError < StandardError; include MyModule; end