File tree Expand file tree Collapse file tree 3 files changed +9
-10
lines changed Expand file tree Collapse file tree 3 files changed +9
-10
lines changed Original file line number Diff line number Diff line change @@ -2528,11 +2528,11 @@ def idle_done
2528
2528
# Prints a warning and returns the mutable responses hash.
2529
2529
# <em>This is not thread-safe.</em>
2530
2530
#
2531
- # [+:frozen_dup+</em>]
2531
+ # [+:frozen_dup+ <em>(planned default for +v0.6+) </em>]
2532
2532
# Returns a frozen copy of the unhandled responses hash, with frozen
2533
2533
# array values.
2534
2534
#
2535
- # [+:raise+ <em>(planned future default)</em> ]
2535
+ # [+:raise+]
2536
2536
# Raise an +ArgumentError+ with the deprecation warning.
2537
2537
#
2538
2538
# For example:
Original file line number Diff line number Diff line change @@ -260,7 +260,7 @@ def self.[](config)
260
260
# Prints a warning and returns the mutable responses hash.
261
261
# <em>This is not thread-safe.</em>
262
262
#
263
- # [+:frozen_dup+</em>]
263
+ # [+:frozen_dup+ <em>(planned default for +v0.6+) </em>]
264
264
# Returns a frozen copy of the unhandled responses hash, with frozen
265
265
# array values.
266
266
#
@@ -269,7 +269,7 @@ def self.[](config)
269
269
#
270
270
# <em>(+:frozen_dup+ config option was added in +v0.4.17+)</em>
271
271
#
272
- # [+:raise+ <em>(planned future default)</em> ]
272
+ # [+:raise+]
273
273
# Raise an ArgumentError with the deprecation warning.
274
274
#
275
275
# Note: #responses_without_args is an alias for #responses_without_block.
@@ -388,12 +388,11 @@ def defaults_hash
388
388
389
389
version_defaults [ 0.5 ] = Config [ :current ]
390
390
391
- version_defaults [ 0.6 ] = Config [ 0.5 ]
392
- version_defaults [ :next ] = Config [ 0.6 ]
393
-
394
- version_defaults [ :future ] = Config [ 0.6 ] . dup . update (
395
- responses_without_block : :raise ,
391
+ version_defaults [ 0.6 ] = Config [ 0.5 ] . dup . update (
392
+ responses_without_block : :frozen_dup ,
396
393
) . freeze
394
+ version_defaults [ :next ] = Config [ 0.6 ]
395
+ version_defaults [ :future ] = Config [ :next ]
397
396
398
397
version_defaults . freeze
399
398
end
Original file line number Diff line number Diff line change @@ -190,7 +190,7 @@ class ConfigTest < Test::Unit::TestCase
190
190
assert_same Config . default , Config . new ( Config . default ) . parent
191
191
assert_same Config . global , Config . new ( Config . global ) . parent
192
192
assert_same Config [ 0.4 ] , Config . new ( 0.4 ) . parent
193
- assert_same Config [ 0.5 ] , Config . new ( :next ) . parent
193
+ assert_same Config [ 0.6 ] , Config . new ( :next ) . parent
194
194
assert_equal true , Config . new ( { debug : true } , debug : false ) . parent . debug?
195
195
assert_equal true , Config . new ( { debug : true } , debug : false ) . parent . frozen?
196
196
end
You can’t perform that action at this time.
0 commit comments