@@ -24,29 +24,6 @@ def test_with_filename
24
24
assert_match ( /\A test filename:1\b / , e . backtrace [ 0 ] )
25
25
end
26
26
27
- # [deprecated] This will be removed later
28
- def test_without_filename_with_safe_level
29
- erb = EnvUtil . suppress_warning do
30
- ERB . new ( "<% raise ::TestERB::MyError %>" , 1 )
31
- end
32
- e = assert_raise ( MyError ) {
33
- erb . result
34
- }
35
- assert_match ( /\A \( erb\) :1\b / , e . backtrace [ 0 ] )
36
- end
37
-
38
- # [deprecated] This will be removed later
39
- def test_with_filename_and_safe_level
40
- erb = EnvUtil . suppress_warning do
41
- ERB . new ( "<% raise ::TestERB::MyError %>" , 1 )
42
- end
43
- erb . filename = "test filename"
44
- e = assert_raise ( MyError ) {
45
- erb . result
46
- }
47
- assert_match ( /\A test filename:1\b / , e . backtrace [ 0 ] )
48
- end
49
-
50
27
def test_with_filename_lineno
51
28
erb = ERB . new ( "<% raise ::TestERB::MyError %>" )
52
29
erb . filename = "test filename"
@@ -98,25 +75,16 @@ def test_version
98
75
end
99
76
100
77
def test_core
101
- # [deprecated] Fix initializer later
102
- EnvUtil . suppress_warning do
103
- _test_core ( nil )
104
- _test_core ( 0 )
105
- _test_core ( 1 )
106
- end
107
- end
108
-
109
- def _test_core ( safe )
110
78
erb = @erb . new ( "hello" )
111
79
assert_equal ( "hello" , erb . result )
112
80
113
- erb = @erb . new ( "hello" , safe , 0 )
81
+ erb = @erb . new ( "hello" , trim_mode : 0 )
114
82
assert_equal ( "hello" , erb . result )
115
83
116
- erb = @erb . new ( "hello" , safe , 1 )
84
+ erb = @erb . new ( "hello" , trim_mode : 1 )
117
85
assert_equal ( "hello" , erb . result )
118
86
119
- erb = @erb . new ( "hello" , safe , 2 )
87
+ erb = @erb . new ( "hello" , trim_mode : 2 )
120
88
assert_equal ( "hello" , erb . result )
121
89
122
90
src = <<EOS
@@ -144,9 +112,9 @@ def _test_core(safe)
144
112
EOS
145
113
erb = @erb . new ( src )
146
114
assert_equal ( ans , erb . result )
147
- erb = @erb . new ( src , safe , 0 )
115
+ erb = @erb . new ( src , trim_mode : 0 )
148
116
assert_equal ( ans , erb . result )
149
- erb = @erb . new ( src , safe , '' )
117
+ erb = EnvUtil . suppress_warning { @erb . new ( src , trim_mode : '' ) }
150
118
assert_equal ( ans , erb . result )
151
119
152
120
ans = <<EOS
@@ -157,9 +125,9 @@ def _test_core(safe)
157
125
* 1% n=0
158
126
* 2
159
127
EOS
160
- erb = @erb . new ( src , safe , 1 )
128
+ erb = @erb . new ( src , trim_mode : 1 )
161
129
assert_equal ( ans . chomp , erb . result )
162
- erb = @erb . new ( src , safe , '>' )
130
+ erb = @erb . new ( src , trim_mode : '>' )
163
131
assert_equal ( ans . chomp , erb . result )
164
132
165
133
ans = <<EOS
@@ -173,9 +141,9 @@ def _test_core(safe)
173
141
* 2
174
142
EOS
175
143
176
- erb = @erb . new ( src , safe , 2 )
144
+ erb = @erb . new ( src , trim_mode : 2 )
177
145
assert_equal ( ans , erb . result )
178
- erb = @erb . new ( src , safe , '<>' )
146
+ erb = @erb . new ( src , trim_mode : '<>' )
179
147
assert_equal ( ans , erb . result )
180
148
181
149
ans = <<EOS
@@ -189,15 +157,15 @@ def _test_core(safe)
189
157
* 0
190
158
191
159
EOS
192
- erb = @erb . new ( src , safe , '%' )
160
+ erb = @erb . new ( src , trim_mode : '%' )
193
161
assert_equal ( ans , erb . result )
194
162
195
163
ans = <<EOS
196
164
% hi
197
165
= hello
198
166
* 0* 0* 0
199
167
EOS
200
- erb = @erb . new ( src , safe , '%>' )
168
+ erb = @erb . new ( src , trim_mode : '%>' )
201
169
assert_equal ( ans . chomp , erb . result )
202
170
203
171
ans = <<EOS
@@ -207,7 +175,7 @@ def _test_core(safe)
207
175
* 0
208
176
* 0
209
177
EOS
210
- erb = @erb . new ( src , safe , '%<>' )
178
+ erb = @erb . new ( src , trim_mode : '%<>' )
211
179
assert_equal ( ans , erb . result )
212
180
end
213
181
@@ -661,27 +629,6 @@ def test_half_working_comment_backward_compatibility
661
629
end
662
630
end
663
631
664
- # [deprecated] These interfaces will be removed later
665
- def test_deprecated_interface_warnings
666
- [ nil , 0 , 1 , 2 ] . each do |safe |
667
- assert_warn ( /2nd argument of ERB.new is deprecated/ ) do
668
- ERB . new ( '' , safe )
669
- end
670
- end
671
-
672
- [ nil , '' , '%' , '%<>' ] . each do |trim |
673
- assert_warn ( /3rd argument of ERB.new is deprecated/ ) do
674
- ERB . new ( '' , nil , trim )
675
- end
676
- end
677
-
678
- [ nil , '_erbout' , '_hamlout' ] . each do |eoutvar |
679
- assert_warn ( /4th argument of ERB.new is deprecated/ ) do
680
- ERB . new ( '' , nil , nil , eoutvar )
681
- end
682
- end
683
- end
684
-
685
632
def test_prohibited_marshal_dump
686
633
erb = ERB . new ( "" )
687
634
assert_raise ( TypeError ) { Marshal . dump ( erb ) }
0 commit comments