summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-01-12 14:57:57 +0000
committerkou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-01-12 14:57:57 +0000
commit7847b2869457d1a534ef2e658473ff4fc0e7f6cb (patch)
tree888a39637314b1c6b85ad78f7cdff2a2cc14cf7c
parentc680899e82ac3d76d8accc143ac7f1423d219739 (diff)
revert r26305.
* lib/rss/maker/base.rb, test/rss/test_maker_0.9.rb: accept any time format in maker. [ruby-core:26923] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@26306 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/rss/test_maker_0.9.rb17
-rw-r--r--test/ruby/test_super.rb22
3 files changed, 0 insertions, 44 deletions
diff --git a/ChangeLog b/ChangeLog
index aed9dae316..13a75fa945 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,3 @@
-Tue Jan 12 23:52:43 2010 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/maker/base.rb, test/rss/test_maker_0.9.rb:
- accept any time format in maker. [ruby-core:26923]
-
Tue Jan 12 12:49:39 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* misc/ruby-mode.el (ruby-here-doc-beg-match): fix for here-doc
diff --git a/test/rss/test_maker_0.9.rb b/test/rss/test_maker_0.9.rb
index 54a9c29b09..fcdc9d0cd4 100644
--- a/test/rss/test_maker_0.9.rb
+++ b/test/rss/test_maker_0.9.rb
@@ -453,22 +453,5 @@ module RSS
end
assert_nil(rss.channel.textInput)
end
-
- def test_date_in_string
- date = Time.now
-
- rss = RSS::Maker.make("0.91") do |maker|
- setup_dummy_channel(maker)
- setup_dummy_image(maker)
-
- maker.items.new_item do |item|
- item.title = "The first item"
- item.link = "http://example.com/blog/1.html"
- item.date = date.rfc822
- end
- end
-
- assert_equal(date.iso8601, rss.items[0].date.iso8601)
- end
end
end
diff --git a/test/ruby/test_super.rb b/test/ruby/test_super.rb
index ce57c29c5d..a9d931c0ef 100644
--- a/test/ruby/test_super.rb
+++ b/test/ruby/test_super.rb
@@ -149,26 +149,4 @@ class TestSuper < Test::Unit::TestCase
c = C.new
assert_equal([c, "#{C.to_s}::m"], c.m, bug2419)
end
-
- class Parent
- def run
- :parent_run
- end
- end
-
- class Child < Parent
- def run
- callback do
- super
- end
- end
-
- def callback(&block)
- block.call
- end
- end
-
- def test_super_in_block_call
- assert_equal(:parent_run, Child.new.run)
- end
end