summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--test/win32ole/test_win32ole_event.rb12
2 files changed, 14 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index a8a43df5a1b..f00454e4f09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 18 09:33:59 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * test/win32ole/test_win32ole_event.rb (TestWIN32OLE_EVENT): use
+ standard skip method to skip tests.
+
Wed Jul 18 09:26:45 2012 Eric Hodel <drbrain@segment7.net>
* lib/logger.rb: Updated typos and output to match modern Logger
@@ -5,8 +10,9 @@ Wed Jul 18 09:26:45 2012 Eric Hodel <drbrain@segment7.net>
Wed Jul 18 07:59:29 2012 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
- * lib/cgi/util.rb (CGI.escapeHTML,unescapeHTML): Add &apos; for HTML5 escaping.
- [Feature #6620]
+ * lib/cgi/util.rb (CGI.escapeHTML,unescapeHTML): Add &apos; for HTML5
+ escaping.
+ [Feature #6620]
Tue Jul 17 22:17:13 2012 Tanaka Akira <akr@fsij.org>
diff --git a/test/win32ole/test_win32ole_event.rb b/test/win32ole/test_win32ole_event.rb
index 7e7ee102222..03e4dcda9e1 100644
--- a/test/win32ole/test_win32ole_event.rb
+++ b/test/win32ole/test_win32ole_event.rb
@@ -22,12 +22,12 @@ def ado_installed?
end
if defined?(WIN32OLE_EVENT)
- dotest = ado_installed?
- if !dotest
- STDERR.puts("\n#{__FILE__} skipped(ActiveX Data Object Library not found.)")
- end
- if dotest
- class TestWIN32OLE_EVENT < Test::Unit::TestCase
+ class TestWIN32OLE_EVENT < Test::Unit::TestCase
+ unless ado_installed?
+ def test_dummy_for_skip_message
+ skip "ActiveX Data Object Library not found"
+ end
+ else
CONNSTR="Driver={Microsoft Text Driver (*.txt; *.csv)};DefaultDir=.;"
module ADO
end