From 9e448999a0b75c45bc3d02d7a3bd1077cae95b8d Mon Sep 17 00:00:00 2001 From: tenderlove Date: Wed, 30 Mar 2011 03:38:53 +0000 Subject: converting require_relative to just regular requires git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31213 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/psych/json/test_stream.rb | 2 +- test/psych/nodes/test_enumerable.rb | 2 +- test/psych/test_alias_and_anchor.rb | 2 +- test/psych/test_array.rb | 2 +- test/psych/test_boolean.rb | 2 +- test/psych/test_class.rb | 2 +- test/psych/test_coder.rb | 2 +- test/psych/test_date_time.rb | 2 +- test/psych/test_deprecated.rb | 2 +- test/psych/test_document.rb | 2 +- test/psych/test_emitter.rb | 2 +- test/psych/test_encoding.rb | 2 +- test/psych/test_engine_manager.rb | 2 +- test/psych/test_exception.rb | 2 +- test/psych/test_hash.rb | 2 +- test/psych/test_json_tree.rb | 2 +- test/psych/test_merge_keys.rb | 2 +- test/psych/test_nil.rb | 2 +- test/psych/test_null.rb | 2 +- test/psych/test_object.rb | 2 +- test/psych/test_omap.rb | 2 +- test/psych/test_parser.rb | 2 +- test/psych/test_psych.rb | 2 +- test/psych/test_scalar.rb | 2 +- test/psych/test_scalar_scanner.rb | 2 +- test/psych/test_serialize_subclasses.rb | 2 +- test/psych/test_set.rb | 2 +- test/psych/test_stream.rb | 2 +- test/psych/test_string.rb | 2 +- test/psych/test_struct.rb | 2 +- test/psych/test_symbol.rb | 2 +- test/psych/test_to_yaml_properties.rb | 2 +- test/psych/test_tree_builder.rb | 2 +- test/psych/test_yaml.rb | 2 +- test/psych/visitors/test_depth_first.rb | 2 +- test/psych/visitors/test_emitter.rb | 2 +- test/psych/visitors/test_to_ruby.rb | 2 +- test/psych/visitors/test_yaml_tree.rb | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) (limited to 'test') diff --git a/test/psych/json/test_stream.rb b/test/psych/json/test_stream.rb index 45d0219aad..0af64c1885 100644 --- a/test/psych/json/test_stream.rb +++ b/test/psych/json/test_stream.rb @@ -1,4 +1,4 @@ -require_relative '../helper' +require 'psych/helper' module Psych module JSON diff --git a/test/psych/nodes/test_enumerable.rb b/test/psych/nodes/test_enumerable.rb index 57d4e895b4..19cf94bd51 100644 --- a/test/psych/nodes/test_enumerable.rb +++ b/test/psych/nodes/test_enumerable.rb @@ -1,4 +1,4 @@ -require_relative '../helper' +require 'psych/helper' module Psych module Nodes diff --git a/test/psych/test_alias_and_anchor.rb b/test/psych/test_alias_and_anchor.rb index 8c9cd8076a..48771d6e25 100644 --- a/test/psych/test_alias_and_anchor.rb +++ b/test/psych/test_alias_and_anchor.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' module Psych class TestAliasAndAnchor < TestCase diff --git a/test/psych/test_array.rb b/test/psych/test_array.rb index f006cc866c..ec6a1aa147 100644 --- a/test/psych/test_array.rb +++ b/test/psych/test_array.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' module Psych class TestArray < TestCase diff --git a/test/psych/test_boolean.rb b/test/psych/test_boolean.rb index b656f4f90e..ebfa25e56a 100644 --- a/test/psych/test_boolean.rb +++ b/test/psych/test_boolean.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' module Psych ### diff --git a/test/psych/test_class.rb b/test/psych/test_class.rb index 5a39b8c74a..cba88ba75b 100644 --- a/test/psych/test_class.rb +++ b/test/psych/test_class.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' module Psych class TestClass < TestCase diff --git a/test/psych/test_coder.rb b/test/psych/test_coder.rb index 4809b13d5d..7539c7d408 100644 --- a/test/psych/test_coder.rb +++ b/test/psych/test_coder.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' module Psych class TestCoder < TestCase diff --git a/test/psych/test_date_time.rb b/test/psych/test_date_time.rb index df66d142f6..fb76cb3a00 100644 --- a/test/psych/test_date_time.rb +++ b/test/psych/test_date_time.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' require 'date' module Psych diff --git a/test/psych/test_deprecated.rb b/test/psych/test_deprecated.rb index a272db2332..cfce0825e9 100644 --- a/test/psych/test_deprecated.rb +++ b/test/psych/test_deprecated.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' module Psych class TestDeprecated < TestCase diff --git a/test/psych/test_document.rb b/test/psych/test_document.rb index 358fc51c4a..55add5f4dd 100644 --- a/test/psych/test_document.rb +++ b/test/psych/test_document.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' module Psych class TestDocument < TestCase diff --git a/test/psych/test_emitter.rb b/test/psych/test_emitter.rb index 0554ae5f85..dfd20e1507 100644 --- a/test/psych/test_emitter.rb +++ b/test/psych/test_emitter.rb @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -require_relative 'helper' +require 'psych/helper' module Psych class TestEmitter < TestCase diff --git a/test/psych/test_encoding.rb b/test/psych/test_encoding.rb index 8e9766329d..029ff75ed9 100644 --- a/test/psych/test_encoding.rb +++ b/test/psych/test_encoding.rb @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -require_relative 'helper' +require 'psych/helper' module Psych class TestEncoding < TestCase diff --git a/test/psych/test_engine_manager.rb b/test/psych/test_engine_manager.rb index 8bd7d6c1da..d52a80e2ac 100644 --- a/test/psych/test_engine_manager.rb +++ b/test/psych/test_engine_manager.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' require 'yaml' module Psych diff --git a/test/psych/test_exception.rb b/test/psych/test_exception.rb index 7d08ad166a..806c5e2641 100644 --- a/test/psych/test_exception.rb +++ b/test/psych/test_exception.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' module Psych class TestException < TestCase diff --git a/test/psych/test_hash.rb b/test/psych/test_hash.rb index e682ab2a8d..3147076792 100644 --- a/test/psych/test_hash.rb +++ b/test/psych/test_hash.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' module Psych class TestHash < TestCase diff --git a/test/psych/test_json_tree.rb b/test/psych/test_json_tree.rb index b694560367..fefa1f5da0 100644 --- a/test/psych/test_json_tree.rb +++ b/test/psych/test_json_tree.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' module Psych class TestJSONTree < TestCase diff --git a/test/psych/test_merge_keys.rb b/test/psych/test_merge_keys.rb index fef8892727..b3ebe9b463 100644 --- a/test/psych/test_merge_keys.rb +++ b/test/psych/test_merge_keys.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' module Psych class TestMergeKeys < TestCase diff --git a/test/psych/test_nil.rb b/test/psych/test_nil.rb index e63c6c7286..9b54a030c8 100644 --- a/test/psych/test_nil.rb +++ b/test/psych/test_nil.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' module Psych class TestNil < TestCase diff --git a/test/psych/test_null.rb b/test/psych/test_null.rb index e953515ad8..1ebf6444c2 100644 --- a/test/psych/test_null.rb +++ b/test/psych/test_null.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' module Psych ### diff --git a/test/psych/test_object.rb b/test/psych/test_object.rb index 930f31f0b0..9890d5072a 100644 --- a/test/psych/test_object.rb +++ b/test/psych/test_object.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' module Psych class Tagged diff --git a/test/psych/test_omap.rb b/test/psych/test_omap.rb index f2f36d15f3..53f55f5aec 100644 --- a/test/psych/test_omap.rb +++ b/test/psych/test_omap.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' module Psych class TestOmap < TestCase diff --git a/test/psych/test_parser.rb b/test/psych/test_parser.rb index a60a0c6d86..decb241d19 100644 --- a/test/psych/test_parser.rb +++ b/test/psych/test_parser.rb @@ -1,6 +1,6 @@ # coding: utf-8 -require_relative 'helper' +require 'psych/helper' module Psych class TestParser < TestCase diff --git a/test/psych/test_psych.rb b/test/psych/test_psych.rb index 81fcccccd4..f59af4601f 100644 --- a/test/psych/test_psych.rb +++ b/test/psych/test_psych.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' require 'stringio' require 'tempfile' diff --git a/test/psych/test_scalar.rb b/test/psych/test_scalar.rb index e6b76975a6..3cf6b0938c 100644 --- a/test/psych/test_scalar.rb +++ b/test/psych/test_scalar.rb @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -require_relative 'helper' +require 'psych/helper' module Psych class TestScalar < TestCase diff --git a/test/psych/test_scalar_scanner.rb b/test/psych/test_scalar_scanner.rb index df54eb1eed..659909909e 100644 --- a/test/psych/test_scalar_scanner.rb +++ b/test/psych/test_scalar_scanner.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' module Psych class TestScalarScanner < TestCase diff --git a/test/psych/test_serialize_subclasses.rb b/test/psych/test_serialize_subclasses.rb index f597b7a051..c8221928a1 100644 --- a/test/psych/test_serialize_subclasses.rb +++ b/test/psych/test_serialize_subclasses.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' module Psych class TestSerializeSubclasses < TestCase diff --git a/test/psych/test_set.rb b/test/psych/test_set.rb index 921fe2284f..bea67d95b6 100644 --- a/test/psych/test_set.rb +++ b/test/psych/test_set.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' module Psych class TestSet < TestCase diff --git a/test/psych/test_stream.rb b/test/psych/test_stream.rb index 7e2f996708..4d8f137431 100644 --- a/test/psych/test_stream.rb +++ b/test/psych/test_stream.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' module Psych class TestStream < TestCase diff --git a/test/psych/test_string.rb b/test/psych/test_string.rb index 1addc9fd22..96d77e0f42 100644 --- a/test/psych/test_string.rb +++ b/test/psych/test_string.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' module Psych class TestString < TestCase diff --git a/test/psych/test_struct.rb b/test/psych/test_struct.rb index 5c6e9b85d2..42c4e113ab 100644 --- a/test/psych/test_struct.rb +++ b/test/psych/test_struct.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' class PsychStructWithIvar < Struct.new(:foo) attr_reader :bar diff --git a/test/psych/test_symbol.rb b/test/psych/test_symbol.rb index 2b4470d184..3226141d02 100644 --- a/test/psych/test_symbol.rb +++ b/test/psych/test_symbol.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' module Psych class TestSymbol < TestCase diff --git a/test/psych/test_to_yaml_properties.rb b/test/psych/test_to_yaml_properties.rb index 5b4860c435..2636becf00 100644 --- a/test/psych/test_to_yaml_properties.rb +++ b/test/psych/test_to_yaml_properties.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' module Psych class TestToYamlProperties < MiniTest::Unit::TestCase diff --git a/test/psych/test_tree_builder.rb b/test/psych/test_tree_builder.rb index 7ad3ddd8a0..9a134d5a2d 100644 --- a/test/psych/test_tree_builder.rb +++ b/test/psych/test_tree_builder.rb @@ -1,4 +1,4 @@ -require_relative 'helper' +require 'psych/helper' module Psych class TestTreeBuilder < TestCase diff --git a/test/psych/test_yaml.rb b/test/psych/test_yaml.rb index 20bf26e5b4..5c2f6dc3bf 100644 --- a/test/psych/test_yaml.rb +++ b/test/psych/test_yaml.rb @@ -2,7 +2,7 @@ # vim:sw=4:ts=4 # $Id$ # -require_relative 'helper' +require 'psych/helper' # [ruby-core:01946] module Psych_Tests diff --git a/test/psych/visitors/test_depth_first.rb b/test/psych/visitors/test_depth_first.rb index a84f5b6a04..837c8e8c11 100644 --- a/test/psych/visitors/test_depth_first.rb +++ b/test/psych/visitors/test_depth_first.rb @@ -1,4 +1,4 @@ -require_relative '../helper' +require 'psych/helper' module Psych module Visitors diff --git a/test/psych/visitors/test_emitter.rb b/test/psych/visitors/test_emitter.rb index 7847cea3a5..de27b4588c 100644 --- a/test/psych/visitors/test_emitter.rb +++ b/test/psych/visitors/test_emitter.rb @@ -1,4 +1,4 @@ -require_relative '../helper' +require 'psych/helper' module Psych module Visitors diff --git a/test/psych/visitors/test_to_ruby.rb b/test/psych/visitors/test_to_ruby.rb index b5b8e1443d..5b0702cf1a 100644 --- a/test/psych/visitors/test_to_ruby.rb +++ b/test/psych/visitors/test_to_ruby.rb @@ -1,4 +1,4 @@ -require_relative '../helper' +require 'psych/helper' module Psych module Visitors diff --git a/test/psych/visitors/test_yaml_tree.rb b/test/psych/visitors/test_yaml_tree.rb index 1cf0d634c8..df775635bf 100644 --- a/test/psych/visitors/test_yaml_tree.rb +++ b/test/psych/visitors/test_yaml_tree.rb @@ -1,4 +1,4 @@ -require_relative '../helper' +require 'psych/helper' module Psych module Visitors -- cgit v1.2.3