summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-07 03:31:32 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-07 03:31:32 +0000
commit882900d2d498a9baea8ad07e151738b90803086c (patch)
treeb9514b8b3b31c8663bb35bb7f9519c791ac74888
parent888d29478408ce283863a13450d1d47902fdc5a3 (diff)
* test/erb/test_erb.rb: reverted space sensitive test results.
* test/rdoc/test_rdoc_parser_c.rb: ditto. * test/rdoc/test_rdoc_ri_default_display.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22804 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--test/erb/test_erb.rb24
-rw-r--r--test/rdoc/test_rdoc_parser_c.rb10
-rw-r--r--test/rdoc/test_rdoc_ri_default_display.rb2
4 files changed, 26 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index 7537900723..3648b654b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Mar 7 12:31:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/erb/test_erb.rb: reverted space sensitive test results.
+
+ * test/rdoc/test_rdoc_parser_c.rb: ditto.
+
+ * test/rdoc/test_rdoc_ri_default_display.rb: ditto.
+
Fri Mar 6 23:35:59 2009 Tanaka Akira <akr@fsij.org>
* lib/securerandom.rb (SecureRandom.urlsafe_base64): add optional
diff --git a/test/erb/test_erb.rb b/test/erb/test_erb.rb
index 3c54e8a50a..01cc740435 100644
--- a/test/erb/test_erb.rb
+++ b/test/erb/test_erb.rb
@@ -212,7 +212,7 @@ end%>
%%%
EOS
ans = <<EOS
-%
+%
% %%><%0
% %%><%1
%%
@@ -234,7 +234,7 @@ EOS
klass.module_eval do
def_erb_method('hello_world', erb)
end
- assert(klass.new.respond_to?('hello_world'))
+ assert(klass.new.respond_to?('hello_world'))
end
def test_def_method_without_filename
@@ -300,7 +300,7 @@ EOS
def test_keep_lineno
src = <<EOS
-Hello,
+Hello,
% x = "World"
<%= x%>
% raise("lineno")
@@ -316,21 +316,21 @@ EOS
src = <<EOS
%>
-Hello,
+Hello,
<% x = "World%%>
"%>
<%= x%>
EOS
ans = <<EOS
-%>Hello,
+%>Hello,
World%>
EOS
assert_equal(ans, ERB.new(src, nil, '>').result)
ans = <<EOS
%>
-Hello,
+Hello,
World%>
EOS
@@ -338,7 +338,7 @@ EOS
ans = <<EOS
%>
-Hello,
+Hello,
World%>
@@ -346,7 +346,7 @@ EOS
assert_equal(ans, ERB.new(src).result)
src = <<EOS
-Hello,
+Hello,
<% x = "World%%>
"%>
<%= x%>
@@ -381,7 +381,7 @@ EOS
% y = 'Hello'
<%- x = "World%%>
"-%>
-<%= x %><%- x = nil -%>
+<%= x %><%- x = nil -%>
<% raise("lineno") %>
EOS
@@ -417,19 +417,19 @@ NotSkip <%- y = x -%> NotSkip
<%- up = w.upcase -%>
* <%= up %>
<%- end -%>
-KeepNewLine <%- z = nil -%>
+KeepNewLine <%- z = nil -%>
EOS
ans = <<EOS
NotSkip NotSkip
* HELLO
* WORLD
- NotSkip
+ NotSkip
* hello
* HELLO
* world
* WORLD
-KeepNewLine
+KeepNewLine
EOS
assert_equal(ans, ERB.new(src, nil, '-').result)
assert_equal(ans, ERB.new(src, nil, '-%').result)
diff --git a/test/rdoc/test_rdoc_parser_c.rb b/test/rdoc/test_rdoc_parser_c.rb
index ce93b5b3f7..ebf96594c8 100644
--- a/test/rdoc/test_rdoc_parser_c.rb
+++ b/test/rdoc/test_rdoc_parser_c.rb
@@ -176,11 +176,11 @@ void Init_foo(){
comment = <<-EOF.chomp
-
+
Multiline comment goes here because this comment spans multiple lines.
Multiline comment goes here because this comment spans multiple lines.
-
-
+
+
EOF
assert_equal ['MULTILINE', 'INT2FIX(1)', comment], constants.shift
assert_equal ['MULTILINE_VALUE', '1', comment], constants.shift
@@ -189,8 +189,8 @@ void Init_foo(){
Multiline comment goes here because this comment spans multiple lines.
Multiline comment goes here because this comment spans multiple lines.
-
-
+
+
EOF
assert_equal ['MULTILINE_NOT_EMPTY', 'INT2FIX(1)', comment], constants.shift
diff --git a/test/rdoc/test_rdoc_ri_default_display.rb b/test/rdoc/test_rdoc_ri_default_display.rb
index 966325ef5c..1182b046c3 100644
--- a/test/rdoc/test_rdoc_ri_default_display.rb
+++ b/test/rdoc/test_rdoc_ri_default_display.rb
@@ -169,7 +169,7 @@ Instance method extensions:
------------------------------------------------------- SomeClass::some_method
SomeClass::some_method(arg1, arg2)
- From
+ From
------------------------------------------------------------------------------
[no description]
EOF