From 767358108ecfd71055f6c75d14f439f3b6b43efb Mon Sep 17 00:00:00 2001 From: hsbt Date: Thu, 26 Jun 2014 09:27:22 +0000 Subject: * test/with_different_ofs.rb: move into test library directory. * test/csv/base.rb: fix require path for with_different_ofs.rb. * test/digest/test_digest_extend.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46563 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/csv/base.rb | 2 +- test/digest/test_digest_extend.rb | 2 +- test/lib/with_different_ofs.rb | 17 +++++++++++++++++ test/with_different_ofs.rb | 17 ----------------- 4 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 test/lib/with_different_ofs.rb delete mode 100644 test/with_different_ofs.rb (limited to 'test') diff --git a/test/csv/base.rb b/test/csv/base.rb index 42f4fa26ea..621569e013 100644 --- a/test/csv/base.rb +++ b/test/csv/base.rb @@ -2,7 +2,7 @@ require "test/unit" require "csv" -require_relative "../with_different_ofs.rb" +require_relative "../lib/with_different_ofs.rb" class TestCSV < Test::Unit::TestCase end diff --git a/test/digest/test_digest_extend.rb b/test/digest/test_digest_extend.rb index 2992e28877..adc5613339 100644 --- a/test/digest/test_digest_extend.rb +++ b/test/digest/test_digest_extend.rb @@ -1,6 +1,6 @@ require 'test/unit' require 'digest' -require_relative '../with_different_ofs.rb' +require_relative '../lib/with_different_ofs.rb' class TestDigestExtend < Test::Unit::TestCase extend DifferentOFS diff --git a/test/lib/with_different_ofs.rb b/test/lib/with_different_ofs.rb new file mode 100644 index 0000000000..76dfa6896c --- /dev/null +++ b/test/lib/with_different_ofs.rb @@ -0,0 +1,17 @@ +module DifferentOFS + module WithDifferentOFS + def setup + super + @ofs, $, = $,, "-" + end + def teardown + $, = @ofs + super + end + end + + def self.extended(klass) + super(klass) + klass.const_set(:DifferentOFS, Class.new(klass).class_eval {include WithDifferentOFS}).name + end +end diff --git a/test/with_different_ofs.rb b/test/with_different_ofs.rb deleted file mode 100644 index 76dfa6896c..0000000000 --- a/test/with_different_ofs.rb +++ /dev/null @@ -1,17 +0,0 @@ -module DifferentOFS - module WithDifferentOFS - def setup - super - @ofs, $, = $,, "-" - end - def teardown - $, = @ofs - super - end - end - - def self.extended(klass) - super(klass) - klass.const_set(:DifferentOFS, Class.new(klass).class_eval {include WithDifferentOFS}).name - end -end -- cgit v1.2.3