summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-06 03:13:08 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-06 03:13:08 +0000
commit58195557b203972799cf84c3b224bf144bf5756f (patch)
tree4b7a68e477b13e1d4e1c17ec4ae974a6dbe7c029
parent2eb8b115eaf41cf3533a1485e001fbd79fad5042 (diff)
* test/fileutils/fileasserts.rb (FileAssertions): separate module.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30804 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--test/fileutils/clobber.rb2
-rw-r--r--test/fileutils/fileasserts.rb2
-rw-r--r--test/fileutils/test_fileutils.rb1
4 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f657c2b..baa15da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Feb 6 12:12:59 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/fileutils/fileasserts.rb (FileAssertions): separate module.
+
Sun Feb 6 11:29:23 2011 Tanaka Akira <akr@fsij.org>
* ext/dbm/dbm.c: parenthesize macro arguments.
diff --git a/test/fileutils/clobber.rb b/test/fileutils/clobber.rb
index b3359e9..9f94665 100644
--- a/test/fileutils/clobber.rb
+++ b/test/fileutils/clobber.rb
@@ -7,6 +7,8 @@ class TestFileUtils < Test::Unit::TestCase
end
module TestFileUtils::Clobber
+ include Test::Unit::FileAssertions
+
def my_rm_rf(path)
if File.exist?('/bin/rm')
system %Q[/bin/rm -rf "#{path}"]
diff --git a/test/fileutils/fileasserts.rb b/test/fileutils/fileasserts.rb
index 47a769c..e8c5fa4 100644
--- a/test/fileutils/fileasserts.rb
+++ b/test/fileutils/fileasserts.rb
@@ -2,7 +2,7 @@
module Test
module Unit
- module Assertions # redefine
+ module FileAssertions
def _wrap_assertion
yield
diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb
index 494204c..3ec8dce 100644
--- a/test/fileutils/test_fileutils.rb
+++ b/test/fileutils/test_fileutils.rb
@@ -8,6 +8,7 @@ require 'test/unit'
class TestFileUtils < Test::Unit::TestCase
TMPROOT = "#{Dir.tmpdir}/fileutils.rb.#{$$}"
+ include Test::Unit::FileAssertions
end
prevdir = Dir.pwd