summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/rdoc/test_rdoc_ri_driver.rb9
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 54e618969a..8e7d3c0238 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 28 22:14:22 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/rdoc/test_rdoc_ri_driver.rb (TestRDocRIDriver#test_formatter):
+ fix a test accordingly to r28455.
+
Mon Jun 28 21:56:14 2010 Yusuke Endoh <mame@tsg.ne.jp>
* thread.c (rb_fd_resize, rb_fd_copy): avoid NULL dereference upon
diff --git a/test/rdoc/test_rdoc_ri_driver.rb b/test/rdoc/test_rdoc_ri_driver.rb
index 51f2576cb4..8d64916088 100644
--- a/test/rdoc/test_rdoc_ri_driver.rb
+++ b/test/rdoc/test_rdoc_ri_driver.rb
@@ -498,15 +498,18 @@ Foo::Bar#bother
def test_formatter
driver = RDoc::RI::Driver.new
- assert_instance_of @RM::ToAnsi, driver.formatter
+ io = Object.new
+ def io.tty?; true; end
+
+ assert_instance_of @RM::ToAnsi, driver.formatter(io)
driver.instance_variable_set :@paging, true
- assert_instance_of @RM::ToBs, driver.formatter
+ assert_instance_of @RM::ToBs, driver.formatter(io)
driver.instance_variable_set :@formatter_klass, @RM::ToHtml
- assert_instance_of @RM::ToHtml, driver.formatter
+ assert_instance_of @RM::ToHtml, driver.formatter(io)
end
def test_method_type