From 401b64c4e840bc8887219e9e445a64b3d5943656 Mon Sep 17 00:00:00 2001 From: eregon Date: Sun, 4 Mar 2018 15:09:32 +0000 Subject: Update to ruby/spec@c1b568b git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62656 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- spec/ruby/core/encoding/_dump_spec.rb | 2 +- spec/ruby/core/encoding/_load_spec.rb | 2 +- spec/ruby/core/encoding/aliases_spec.rb | 2 +- spec/ruby/core/encoding/ascii_compatible_spec.rb | 2 +- spec/ruby/core/encoding/compatible_spec.rb | 2 +- spec/ruby/core/encoding/converter/asciicompat_encoding_spec.rb | 2 +- spec/ruby/core/encoding/converter/constants_spec.rb | 2 +- spec/ruby/core/encoding/converter/convert_spec.rb | 2 +- spec/ruby/core/encoding/converter/convpath_spec.rb | 2 +- spec/ruby/core/encoding/converter/destination_encoding_spec.rb | 2 +- spec/ruby/core/encoding/converter/finish_spec.rb | 2 +- spec/ruby/core/encoding/converter/insert_output_spec.rb | 2 +- spec/ruby/core/encoding/converter/inspect_spec.rb | 2 +- spec/ruby/core/encoding/converter/last_error_spec.rb | 2 +- spec/ruby/core/encoding/converter/new_spec.rb | 2 +- spec/ruby/core/encoding/converter/primitive_convert_spec.rb | 2 +- spec/ruby/core/encoding/converter/primitive_errinfo_spec.rb | 2 +- spec/ruby/core/encoding/converter/putback_spec.rb | 2 +- spec/ruby/core/encoding/converter/replacement_spec.rb | 2 +- spec/ruby/core/encoding/converter/search_convpath_spec.rb | 2 +- spec/ruby/core/encoding/converter/source_encoding_spec.rb | 2 +- spec/ruby/core/encoding/default_external_spec.rb | 2 +- spec/ruby/core/encoding/default_internal_spec.rb | 2 +- spec/ruby/core/encoding/dummy_spec.rb | 2 +- spec/ruby/core/encoding/find_spec.rb | 2 +- spec/ruby/core/encoding/inspect_spec.rb | 2 +- .../invalid_byte_sequence_error/destination_encoding_name_spec.rb | 2 +- .../encoding/invalid_byte_sequence_error/destination_encoding_spec.rb | 2 +- spec/ruby/core/encoding/invalid_byte_sequence_error/error_bytes_spec.rb | 2 +- .../core/encoding/invalid_byte_sequence_error/incomplete_input_spec.rb | 2 +- .../core/encoding/invalid_byte_sequence_error/readagain_bytes_spec.rb | 2 +- .../encoding/invalid_byte_sequence_error/source_encoding_name_spec.rb | 2 +- .../core/encoding/invalid_byte_sequence_error/source_encoding_spec.rb | 2 +- spec/ruby/core/encoding/list_spec.rb | 2 +- spec/ruby/core/encoding/locale_charmap_spec.rb | 2 +- spec/ruby/core/encoding/name_list_spec.rb | 2 +- spec/ruby/core/encoding/name_spec.rb | 2 +- spec/ruby/core/encoding/names_spec.rb | 2 +- spec/ruby/core/encoding/replicate_spec.rb | 2 +- spec/ruby/core/encoding/shared/name.rb | 2 +- spec/ruby/core/encoding/to_s_spec.rb | 2 +- .../undefined_conversion_error/destination_encoding_name_spec.rb | 2 +- .../encoding/undefined_conversion_error/destination_encoding_spec.rb | 2 +- spec/ruby/core/encoding/undefined_conversion_error/error_char_spec.rb | 2 +- .../encoding/undefined_conversion_error/source_encoding_name_spec.rb | 2 +- .../core/encoding/undefined_conversion_error/source_encoding_spec.rb | 2 +- 46 files changed, 46 insertions(+), 46 deletions(-) (limited to 'spec/ruby/core/encoding') diff --git a/spec/ruby/core/encoding/_dump_spec.rb b/spec/ruby/core/encoding/_dump_spec.rb index 4e8305712e..623fe88ec9 100644 --- a/spec/ruby/core/encoding/_dump_spec.rb +++ b/spec/ruby/core/encoding/_dump_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' describe "Encoding#_dump" do it "needs to be reviewed for spec completeness" diff --git a/spec/ruby/core/encoding/_load_spec.rb b/spec/ruby/core/encoding/_load_spec.rb index b8cdbaa32b..608098d34b 100644 --- a/spec/ruby/core/encoding/_load_spec.rb +++ b/spec/ruby/core/encoding/_load_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' describe "Encoding._load" do it "needs to be reviewed for spec completeness" diff --git a/spec/ruby/core/encoding/aliases_spec.rb b/spec/ruby/core/encoding/aliases_spec.rb index 327c8fa641..88c7a1f2ef 100644 --- a/spec/ruby/core/encoding/aliases_spec.rb +++ b/spec/ruby/core/encoding/aliases_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' with_feature :encoding do describe "Encoding.aliases" do diff --git a/spec/ruby/core/encoding/ascii_compatible_spec.rb b/spec/ruby/core/encoding/ascii_compatible_spec.rb index db3c31c9fb..31ac75302e 100644 --- a/spec/ruby/core/encoding/ascii_compatible_spec.rb +++ b/spec/ruby/core/encoding/ascii_compatible_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' with_feature :encoding do describe "Encoding#ascii_compatible?" do diff --git a/spec/ruby/core/encoding/compatible_spec.rb b/spec/ruby/core/encoding/compatible_spec.rb index 55e3d0fb4d..f35120325c 100644 --- a/spec/ruby/core/encoding/compatible_spec.rb +++ b/spec/ruby/core/encoding/compatible_spec.rb @@ -1,6 +1,6 @@ # -*- encoding: ascii-8bit -*- -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' with_feature :encoding do # TODO: add IO diff --git a/spec/ruby/core/encoding/converter/asciicompat_encoding_spec.rb b/spec/ruby/core/encoding/converter/asciicompat_encoding_spec.rb index 329e09cade..f06a138ba6 100644 --- a/spec/ruby/core/encoding/converter/asciicompat_encoding_spec.rb +++ b/spec/ruby/core/encoding/converter/asciicompat_encoding_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../../spec_helper', __FILE__) +require_relative '../../../spec_helper' with_feature :encoding do describe "Encoding::Converter.asciicompat_encoding" do diff --git a/spec/ruby/core/encoding/converter/constants_spec.rb b/spec/ruby/core/encoding/converter/constants_spec.rb index 16eb60b4ab..9a03f61baf 100644 --- a/spec/ruby/core/encoding/converter/constants_spec.rb +++ b/spec/ruby/core/encoding/converter/constants_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../../spec_helper', __FILE__) +require_relative '../../../spec_helper' with_feature :encoding do describe "Encoding::Converter::INVALID_MASK" do diff --git a/spec/ruby/core/encoding/converter/convert_spec.rb b/spec/ruby/core/encoding/converter/convert_spec.rb index 588d659ceb..525e83a17f 100644 --- a/spec/ruby/core/encoding/converter/convert_spec.rb +++ b/spec/ruby/core/encoding/converter/convert_spec.rb @@ -1,5 +1,5 @@ # -*- encoding: binary -*- -require File.expand_path('../../../../spec_helper', __FILE__) +require_relative '../../../spec_helper' with_feature :encoding do describe "Encoding::Converter#convert" do diff --git a/spec/ruby/core/encoding/converter/convpath_spec.rb b/spec/ruby/core/encoding/converter/convpath_spec.rb index 679b894f58..5e8aa8c2a2 100644 --- a/spec/ruby/core/encoding/converter/convpath_spec.rb +++ b/spec/ruby/core/encoding/converter/convpath_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../../spec_helper', __FILE__) +require_relative '../../../spec_helper' with_feature :encoding do describe "Encoding::Converter#convpath" do diff --git a/spec/ruby/core/encoding/converter/destination_encoding_spec.rb b/spec/ruby/core/encoding/converter/destination_encoding_spec.rb index 830e6d2178..2d0f8e0697 100644 --- a/spec/ruby/core/encoding/converter/destination_encoding_spec.rb +++ b/spec/ruby/core/encoding/converter/destination_encoding_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../../spec_helper', __FILE__) +require_relative '../../../spec_helper' with_feature :encoding do describe "Encoding::Converter#destination_encoding" do diff --git a/spec/ruby/core/encoding/converter/finish_spec.rb b/spec/ruby/core/encoding/converter/finish_spec.rb index 86097357f4..917f3d2912 100644 --- a/spec/ruby/core/encoding/converter/finish_spec.rb +++ b/spec/ruby/core/encoding/converter/finish_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../../spec_helper', __FILE__) +require_relative '../../../spec_helper' with_feature :encoding do describe "Encoding::Converter#finish" do diff --git a/spec/ruby/core/encoding/converter/insert_output_spec.rb b/spec/ruby/core/encoding/converter/insert_output_spec.rb index bc9a56ba45..1346adde1e 100644 --- a/spec/ruby/core/encoding/converter/insert_output_spec.rb +++ b/spec/ruby/core/encoding/converter/insert_output_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../../spec_helper', __FILE__) +require_relative '../../../spec_helper' describe "Encoding::Converter#insert_output" do it "needs to be reviewed for spec completeness" diff --git a/spec/ruby/core/encoding/converter/inspect_spec.rb b/spec/ruby/core/encoding/converter/inspect_spec.rb index b8216176cf..3170ee451f 100644 --- a/spec/ruby/core/encoding/converter/inspect_spec.rb +++ b/spec/ruby/core/encoding/converter/inspect_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../../spec_helper', __FILE__) +require_relative '../../../spec_helper' describe "Encoding::Converter#inspect" do it "includes the source and destination encodings in the return value" do diff --git a/spec/ruby/core/encoding/converter/last_error_spec.rb b/spec/ruby/core/encoding/converter/last_error_spec.rb index f8a2eeba69..7275b31180 100644 --- a/spec/ruby/core/encoding/converter/last_error_spec.rb +++ b/spec/ruby/core/encoding/converter/last_error_spec.rb @@ -1,5 +1,5 @@ # -*- encoding: binary -*- -require File.expand_path('../../../../spec_helper', __FILE__) +require_relative '../../../spec_helper' with_feature :encoding do describe "Encoding::Converter#last_error" do diff --git a/spec/ruby/core/encoding/converter/new_spec.rb b/spec/ruby/core/encoding/converter/new_spec.rb index d228c80a18..08c47daefc 100644 --- a/spec/ruby/core/encoding/converter/new_spec.rb +++ b/spec/ruby/core/encoding/converter/new_spec.rb @@ -1,5 +1,5 @@ # -*- encoding: ascii-8bit -*- -require File.expand_path('../../../../spec_helper', __FILE__) +require_relative '../../../spec_helper' with_feature :encoding do describe "Encoding::Converter.new" do diff --git a/spec/ruby/core/encoding/converter/primitive_convert_spec.rb b/spec/ruby/core/encoding/converter/primitive_convert_spec.rb index ed479c6b13..182e321e5c 100644 --- a/spec/ruby/core/encoding/converter/primitive_convert_spec.rb +++ b/spec/ruby/core/encoding/converter/primitive_convert_spec.rb @@ -1,5 +1,5 @@ # -*- encoding: binary -*- -require File.expand_path('../../../../spec_helper', __FILE__) +require_relative '../../../spec_helper' with_feature :encoding do describe "Encoding::Converter#primitive_convert" do diff --git a/spec/ruby/core/encoding/converter/primitive_errinfo_spec.rb b/spec/ruby/core/encoding/converter/primitive_errinfo_spec.rb index cba654b9fe..835e5517e4 100644 --- a/spec/ruby/core/encoding/converter/primitive_errinfo_spec.rb +++ b/spec/ruby/core/encoding/converter/primitive_errinfo_spec.rb @@ -1,5 +1,5 @@ # -*- encoding: binary -*- -require File.expand_path('../../../../spec_helper', __FILE__) +require_relative '../../../spec_helper' with_feature :encoding do describe "Encoding::Converter#primitive_errinfo" do diff --git a/spec/ruby/core/encoding/converter/putback_spec.rb b/spec/ruby/core/encoding/converter/putback_spec.rb index 3ed1ad9956..119ac7b20e 100644 --- a/spec/ruby/core/encoding/converter/putback_spec.rb +++ b/spec/ruby/core/encoding/converter/putback_spec.rb @@ -1,5 +1,5 @@ # -*- encoding: binary -*- -require File.expand_path('../../../../spec_helper', __FILE__) +require_relative '../../../spec_helper' with_feature :encoding do describe "Encoding::Converter#putback" do diff --git a/spec/ruby/core/encoding/converter/replacement_spec.rb b/spec/ruby/core/encoding/converter/replacement_spec.rb index 9c25887cd7..506bf5c4af 100644 --- a/spec/ruby/core/encoding/converter/replacement_spec.rb +++ b/spec/ruby/core/encoding/converter/replacement_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../../spec_helper', __FILE__) +require_relative '../../../spec_helper' with_feature :encoding do describe "Encoding::Converter#replacement" do diff --git a/spec/ruby/core/encoding/converter/search_convpath_spec.rb b/spec/ruby/core/encoding/converter/search_convpath_spec.rb index c04eeb98ad..1f1438f756 100644 --- a/spec/ruby/core/encoding/converter/search_convpath_spec.rb +++ b/spec/ruby/core/encoding/converter/search_convpath_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../../spec_helper', __FILE__) +require_relative '../../../spec_helper' with_feature :encoding do describe "Encoding::Converter.search_convpath" do diff --git a/spec/ruby/core/encoding/converter/source_encoding_spec.rb b/spec/ruby/core/encoding/converter/source_encoding_spec.rb index acec01502d..5abb009dda 100644 --- a/spec/ruby/core/encoding/converter/source_encoding_spec.rb +++ b/spec/ruby/core/encoding/converter/source_encoding_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../../spec_helper', __FILE__) +require_relative '../../../spec_helper' with_feature :encoding do describe "Encoding::Converter#source_encoding" do diff --git a/spec/ruby/core/encoding/default_external_spec.rb b/spec/ruby/core/encoding/default_external_spec.rb index 23f6c90f9b..3de52043e2 100644 --- a/spec/ruby/core/encoding/default_external_spec.rb +++ b/spec/ruby/core/encoding/default_external_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' with_feature :encoding do describe "Encoding.default_external" do diff --git a/spec/ruby/core/encoding/default_internal_spec.rb b/spec/ruby/core/encoding/default_internal_spec.rb index 1e2b7e40c9..5ff475454b 100644 --- a/spec/ruby/core/encoding/default_internal_spec.rb +++ b/spec/ruby/core/encoding/default_internal_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' with_feature :encoding do describe "Encoding.default_internal" do diff --git a/spec/ruby/core/encoding/dummy_spec.rb b/spec/ruby/core/encoding/dummy_spec.rb index 7917c71e47..ef634829d1 100644 --- a/spec/ruby/core/encoding/dummy_spec.rb +++ b/spec/ruby/core/encoding/dummy_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' with_feature :encoding do describe "Encoding#dummy?" do diff --git a/spec/ruby/core/encoding/find_spec.rb b/spec/ruby/core/encoding/find_spec.rb index bd195f6a1a..3b00de27d4 100644 --- a/spec/ruby/core/encoding/find_spec.rb +++ b/spec/ruby/core/encoding/find_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' with_feature :encoding do describe "Encoding.find" do diff --git a/spec/ruby/core/encoding/inspect_spec.rb b/spec/ruby/core/encoding/inspect_spec.rb index 771232e433..9da9275eae 100644 --- a/spec/ruby/core/encoding/inspect_spec.rb +++ b/spec/ruby/core/encoding/inspect_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' with_feature :encoding do describe "Encoding#inspect" do diff --git a/spec/ruby/core/encoding/invalid_byte_sequence_error/destination_encoding_name_spec.rb b/spec/ruby/core/encoding/invalid_byte_sequence_error/destination_encoding_name_spec.rb index 790dd18655..51c802f7e1 100644 --- a/spec/ruby/core/encoding/invalid_byte_sequence_error/destination_encoding_name_spec.rb +++ b/spec/ruby/core/encoding/invalid_byte_sequence_error/destination_encoding_name_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../fixtures/classes', __FILE__) +require_relative '../fixtures/classes' with_feature :encoding do describe "Encoding::InvalidByteSequenceError#destination_encoding_name" do diff --git a/spec/ruby/core/encoding/invalid_byte_sequence_error/destination_encoding_spec.rb b/spec/ruby/core/encoding/invalid_byte_sequence_error/destination_encoding_spec.rb index 981a62424e..d9e63a6779 100644 --- a/spec/ruby/core/encoding/invalid_byte_sequence_error/destination_encoding_spec.rb +++ b/spec/ruby/core/encoding/invalid_byte_sequence_error/destination_encoding_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../fixtures/classes', __FILE__) +require_relative '../fixtures/classes' with_feature :encoding do describe "Encoding::InvalidByteSequenceError#destination_encoding" do diff --git a/spec/ruby/core/encoding/invalid_byte_sequence_error/error_bytes_spec.rb b/spec/ruby/core/encoding/invalid_byte_sequence_error/error_bytes_spec.rb index 633ad2e1f7..79b381a370 100644 --- a/spec/ruby/core/encoding/invalid_byte_sequence_error/error_bytes_spec.rb +++ b/spec/ruby/core/encoding/invalid_byte_sequence_error/error_bytes_spec.rb @@ -1,5 +1,5 @@ # -*- encoding: binary -*- -require File.expand_path('../../fixtures/classes', __FILE__) +require_relative '../fixtures/classes' with_feature :encoding do describe "Encoding::InvalidByteSequenceError#error_bytes" do diff --git a/spec/ruby/core/encoding/invalid_byte_sequence_error/incomplete_input_spec.rb b/spec/ruby/core/encoding/invalid_byte_sequence_error/incomplete_input_spec.rb index c79a6663e2..f89c0d8c03 100644 --- a/spec/ruby/core/encoding/invalid_byte_sequence_error/incomplete_input_spec.rb +++ b/spec/ruby/core/encoding/invalid_byte_sequence_error/incomplete_input_spec.rb @@ -1,5 +1,5 @@ # -*- encoding: binary -*- -require File.expand_path('../../../../spec_helper', __FILE__) +require_relative '../../../spec_helper' with_feature :encoding do describe "Encoding::InvalidByteSequenceError#incomplete_input?" do diff --git a/spec/ruby/core/encoding/invalid_byte_sequence_error/readagain_bytes_spec.rb b/spec/ruby/core/encoding/invalid_byte_sequence_error/readagain_bytes_spec.rb index 31408a4320..4270a0647a 100644 --- a/spec/ruby/core/encoding/invalid_byte_sequence_error/readagain_bytes_spec.rb +++ b/spec/ruby/core/encoding/invalid_byte_sequence_error/readagain_bytes_spec.rb @@ -1,5 +1,5 @@ # -*- encoding: binary -*- -require File.expand_path('../../fixtures/classes', __FILE__) +require_relative '../fixtures/classes' with_feature :encoding do describe "Encoding::InvalidByteSequenceError#readagain_bytes" do diff --git a/spec/ruby/core/encoding/invalid_byte_sequence_error/source_encoding_name_spec.rb b/spec/ruby/core/encoding/invalid_byte_sequence_error/source_encoding_name_spec.rb index 428b292c68..bd31c03eee 100644 --- a/spec/ruby/core/encoding/invalid_byte_sequence_error/source_encoding_name_spec.rb +++ b/spec/ruby/core/encoding/invalid_byte_sequence_error/source_encoding_name_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../fixtures/classes', __FILE__) +require_relative '../fixtures/classes' with_feature :encoding do describe "Encoding::UndefinedConversionError#source_encoding_name" do diff --git a/spec/ruby/core/encoding/invalid_byte_sequence_error/source_encoding_spec.rb b/spec/ruby/core/encoding/invalid_byte_sequence_error/source_encoding_spec.rb index 09379acc5d..3f36d504d5 100644 --- a/spec/ruby/core/encoding/invalid_byte_sequence_error/source_encoding_spec.rb +++ b/spec/ruby/core/encoding/invalid_byte_sequence_error/source_encoding_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../fixtures/classes', __FILE__) +require_relative '../fixtures/classes' with_feature :encoding do describe "Encoding::InvalidByteSequenceError#source_encoding" do diff --git a/spec/ruby/core/encoding/list_spec.rb b/spec/ruby/core/encoding/list_spec.rb index 18488607e5..b1e08c7a2e 100644 --- a/spec/ruby/core/encoding/list_spec.rb +++ b/spec/ruby/core/encoding/list_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' with_feature :encoding do describe "Encoding.list" do diff --git a/spec/ruby/core/encoding/locale_charmap_spec.rb b/spec/ruby/core/encoding/locale_charmap_spec.rb index a9f0cd5ee0..54dad396fd 100644 --- a/spec/ruby/core/encoding/locale_charmap_spec.rb +++ b/spec/ruby/core/encoding/locale_charmap_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' with_feature :encoding do describe "Encoding.locale_charmap" do diff --git a/spec/ruby/core/encoding/name_list_spec.rb b/spec/ruby/core/encoding/name_list_spec.rb index c06ec410ec..6e02347bfd 100644 --- a/spec/ruby/core/encoding/name_list_spec.rb +++ b/spec/ruby/core/encoding/name_list_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' with_feature :encoding do describe "Encoding.name_list" do diff --git a/spec/ruby/core/encoding/name_spec.rb b/spec/ruby/core/encoding/name_spec.rb index a8b2b93c1b..1632137f95 100644 --- a/spec/ruby/core/encoding/name_spec.rb +++ b/spec/ruby/core/encoding/name_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../shared/name', __FILE__) +require_relative 'shared/name' with_feature :encoding do describe "Encoding#name" do diff --git a/spec/ruby/core/encoding/names_spec.rb b/spec/ruby/core/encoding/names_spec.rb index 3cd741e513..c0f84c9b2b 100644 --- a/spec/ruby/core/encoding/names_spec.rb +++ b/spec/ruby/core/encoding/names_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' with_feature :encoding do describe "Encoding#names" do diff --git a/spec/ruby/core/encoding/replicate_spec.rb b/spec/ruby/core/encoding/replicate_spec.rb index 5d007dd827..2e1d75f1d0 100644 --- a/spec/ruby/core/encoding/replicate_spec.rb +++ b/spec/ruby/core/encoding/replicate_spec.rb @@ -1,5 +1,5 @@ # -*- encoding: binary -*- -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' with_feature :encoding do describe "Encoding#replicate" do diff --git a/spec/ruby/core/encoding/shared/name.rb b/spec/ruby/core/encoding/shared/name.rb index 7f85c46764..cd37ea06db 100644 --- a/spec/ruby/core/encoding/shared/name.rb +++ b/spec/ruby/core/encoding/shared/name.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../../spec_helper', __FILE__) +require_relative '../../../spec_helper' describe :encoding_name, shared: true do it "returns a String" do diff --git a/spec/ruby/core/encoding/to_s_spec.rb b/spec/ruby/core/encoding/to_s_spec.rb index 46dba8e091..e554bc3fee 100644 --- a/spec/ruby/core/encoding/to_s_spec.rb +++ b/spec/ruby/core/encoding/to_s_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../shared/name', __FILE__) +require_relative 'shared/name' with_feature :encoding do describe "Encoding#to_s" do diff --git a/spec/ruby/core/encoding/undefined_conversion_error/destination_encoding_name_spec.rb b/spec/ruby/core/encoding/undefined_conversion_error/destination_encoding_name_spec.rb index 2f7f33e45e..a40f295fcf 100644 --- a/spec/ruby/core/encoding/undefined_conversion_error/destination_encoding_name_spec.rb +++ b/spec/ruby/core/encoding/undefined_conversion_error/destination_encoding_name_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../fixtures/classes', __FILE__) +require_relative '../fixtures/classes' with_feature :encoding do describe "Encoding::UndefinedConversionError#destination_encoding_name" do diff --git a/spec/ruby/core/encoding/undefined_conversion_error/destination_encoding_spec.rb b/spec/ruby/core/encoding/undefined_conversion_error/destination_encoding_spec.rb index 6d4f42c0d8..579b0a37f8 100644 --- a/spec/ruby/core/encoding/undefined_conversion_error/destination_encoding_spec.rb +++ b/spec/ruby/core/encoding/undefined_conversion_error/destination_encoding_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../fixtures/classes', __FILE__) +require_relative '../fixtures/classes' with_feature :encoding do describe "Encoding::UndefinedConversionError#destination_encoding" do diff --git a/spec/ruby/core/encoding/undefined_conversion_error/error_char_spec.rb b/spec/ruby/core/encoding/undefined_conversion_error/error_char_spec.rb index 7f538a60d6..740cd17e30 100644 --- a/spec/ruby/core/encoding/undefined_conversion_error/error_char_spec.rb +++ b/spec/ruby/core/encoding/undefined_conversion_error/error_char_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../fixtures/classes', __FILE__) +require_relative '../fixtures/classes' with_feature :encoding do describe "Encoding::UndefinedConversionError#error_char" do diff --git a/spec/ruby/core/encoding/undefined_conversion_error/source_encoding_name_spec.rb b/spec/ruby/core/encoding/undefined_conversion_error/source_encoding_name_spec.rb index 742184250f..79a59ff1e9 100644 --- a/spec/ruby/core/encoding/undefined_conversion_error/source_encoding_name_spec.rb +++ b/spec/ruby/core/encoding/undefined_conversion_error/source_encoding_name_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../fixtures/classes', __FILE__) +require_relative '../fixtures/classes' with_feature :encoding do describe "Encoding::UndefinedConversionError#source_encoding_name" do diff --git a/spec/ruby/core/encoding/undefined_conversion_error/source_encoding_spec.rb b/spec/ruby/core/encoding/undefined_conversion_error/source_encoding_spec.rb index 0489ad82bf..29be837e13 100644 --- a/spec/ruby/core/encoding/undefined_conversion_error/source_encoding_spec.rb +++ b/spec/ruby/core/encoding/undefined_conversion_error/source_encoding_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../fixtures/classes', __FILE__) +require_relative '../fixtures/classes' with_feature :encoding do describe "Encoding::UndefinedConversionError#source_encoding" do -- cgit v1.2.3