diff options
| author | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-04 15:09:32 +0000 |
|---|---|---|
| committer | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-04 15:09:32 +0000 |
| commit | 401b64c4e840bc8887219e9e445a64b3d5943656 (patch) | |
| tree | 989b93914e9a8ee57ef3ce0bb3d2e2083470fc49 /spec/ruby/language/predefined | |
| parent | 8a15857a7f283101a3923b76c71a1f05bfe58512 (diff) | |
| download | ruby-401b64c4e840bc8887219e9e445a64b3d5943656.tar.gz | |
Update to ruby/spec@c1b568b
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62656 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec/ruby/language/predefined')
| -rw-r--r-- | spec/ruby/language/predefined/data_spec.rb | 2 | ||||
| -rw-r--r-- | spec/ruby/language/predefined/fixtures/data2.rb | 3 | ||||
| -rw-r--r-- | spec/ruby/language/predefined/fixtures/data3.rb | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/spec/ruby/language/predefined/data_spec.rb b/spec/ruby/language/predefined/data_spec.rb index f616879527..1b636967d2 100644 --- a/spec/ruby/language/predefined/data_spec.rb +++ b/spec/ruby/language/predefined/data_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' describe "The DATA constant" do it "exists when the main script contains __END__" do diff --git a/spec/ruby/language/predefined/fixtures/data2.rb b/spec/ruby/language/predefined/fixtures/data2.rb index 0f714b06d4..a764ca56d1 100644 --- a/spec/ruby/language/predefined/fixtures/data2.rb +++ b/spec/ruby/language/predefined/fixtures/data2.rb @@ -1,4 +1,3 @@ - -require File.expand_path("../data4.rb", __FILE__) +require_relative 'data4' p Object.const_defined?(:DATA) diff --git a/spec/ruby/language/predefined/fixtures/data3.rb b/spec/ruby/language/predefined/fixtures/data3.rb index 6cbf63dae6..e37313c68b 100644 --- a/spec/ruby/language/predefined/fixtures/data3.rb +++ b/spec/ruby/language/predefined/fixtures/data3.rb @@ -1,5 +1,4 @@ - -require File.expand_path("../data4.rb", __FILE__) +require_relative 'data4' puts DATA.read |