diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/minitest/test_minitest_unit.rb | 6 | ||||
| -rw-r--r-- | test/ruby/test_time_tz.rb | 10 |
3 files changed, 9 insertions, 13 deletions
@@ -1,3 +1,9 @@ +Sat Aug 9 10:28:03 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + + * test/minitest/test_minitest_unit.rb: removed obsoleted condition + for Ruby 1.8. + * test/ruby/test_time_tz.rb: ditto. + Sat Aug 9 10:18:00 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> * test/cgi/test_cgi_core.rb: removed obsoleted condition for Ruby 1.8. diff --git a/test/minitest/test_minitest_unit.rb b/test/minitest/test_minitest_unit.rb index 88f66dac10..6a01b6cfe3 100644 --- a/test/minitest/test_minitest_unit.rb +++ b/test/minitest/test_minitest_unit.rb @@ -190,11 +190,7 @@ class TestMiniTestUnit < MetaMetaMetaTestCase end def util_expand_bt bt - if RUBY_VERSION >= '1.9.0' then - bt.map { |f| (f =~ /^\./) ? File.expand_path(f) : f } - else - bt - end + bt.map { |f| (f =~ /^\./) ? File.expand_path(f) : f } end end diff --git a/test/ruby/test_time_tz.rb b/test/ruby/test_time_tz.rb index 1e8f303274..1ea532a302 100644 --- a/test/ruby/test_time_tz.rb +++ b/test/ruby/test_time_tz.rb @@ -72,14 +72,8 @@ class TestTimeTZ < Test::Unit::TestCase include Util extend Util - if RUBY_VERSION < "1.9" - def time_to_s(t) - t.strftime("%Y-%m-%d %H:%M:%S ") + format_gmtoff(t.gmtoff) - end - else - def time_to_s(t) - t.to_s - end + def time_to_s(t) + t.to_s end |