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/core/class | |
parent | 8a15857a7f283101a3923b76c71a1f05bfe58512 (diff) |
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/core/class')
-rw-r--r-- | spec/ruby/core/class/allocate_spec.rb | 2 | ||||
-rw-r--r-- | spec/ruby/core/class/dup_spec.rb | 4 | ||||
-rw-r--r-- | spec/ruby/core/class/inherited_spec.rb | 4 | ||||
-rw-r--r-- | spec/ruby/core/class/initialize_spec.rb | 2 | ||||
-rw-r--r-- | spec/ruby/core/class/new_spec.rb | 4 | ||||
-rw-r--r-- | spec/ruby/core/class/superclass_spec.rb | 4 | ||||
-rw-r--r-- | spec/ruby/core/class/to_s_spec.rb | 4 |
7 files changed, 12 insertions, 12 deletions
diff --git a/spec/ruby/core/class/allocate_spec.rb b/spec/ruby/core/class/allocate_spec.rb index 015db292eb..4cf5665392 100644 --- a/spec/ruby/core/class/allocate_spec.rb +++ b/spec/ruby/core/class/allocate_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' describe "Class#allocate" do it "returns an instance of self" do diff --git a/spec/ruby/core/class/dup_spec.rb b/spec/ruby/core/class/dup_spec.rb index 0548536bd6..701fd72e19 100644 --- a/spec/ruby/core/class/dup_spec.rb +++ b/spec/ruby/core/class/dup_spec.rb @@ -1,5 +1,5 @@ -require File.expand_path('../../../spec_helper', __FILE__) -require File.expand_path('../fixtures/classes', __FILE__) +require_relative '../../spec_helper' +require_relative 'fixtures/classes' # NOTE: This is actually implemented by Module#initialize_copy describe "Class#dup" do diff --git a/spec/ruby/core/class/inherited_spec.rb b/spec/ruby/core/class/inherited_spec.rb index 356e46be7c..0ec0d84f6e 100644 --- a/spec/ruby/core/class/inherited_spec.rb +++ b/spec/ruby/core/class/inherited_spec.rb @@ -1,5 +1,5 @@ -require File.expand_path('../../../spec_helper', __FILE__) -require File.expand_path('../fixtures/classes', __FILE__) +require_relative '../../spec_helper' +require_relative 'fixtures/classes' describe "Class.inherited" do diff --git a/spec/ruby/core/class/initialize_spec.rb b/spec/ruby/core/class/initialize_spec.rb index d268596dfe..88a9fcfa7a 100644 --- a/spec/ruby/core/class/initialize_spec.rb +++ b/spec/ruby/core/class/initialize_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' describe "Class#initialize" do it "is private" do diff --git a/spec/ruby/core/class/new_spec.rb b/spec/ruby/core/class/new_spec.rb index 86323b1575..7f7ec183ea 100644 --- a/spec/ruby/core/class/new_spec.rb +++ b/spec/ruby/core/class/new_spec.rb @@ -1,5 +1,5 @@ -require File.expand_path('../../../spec_helper', __FILE__) -require File.expand_path('../fixtures/classes', __FILE__) +require_relative '../../spec_helper' +require_relative 'fixtures/classes' describe "Class.new with a block given" do it "yields the new class as self in the block" do diff --git a/spec/ruby/core/class/superclass_spec.rb b/spec/ruby/core/class/superclass_spec.rb index 18b7ce5bde..deb5a45336 100644 --- a/spec/ruby/core/class/superclass_spec.rb +++ b/spec/ruby/core/class/superclass_spec.rb @@ -1,5 +1,5 @@ -require File.expand_path('../../../spec_helper', __FILE__) -require File.expand_path('../fixtures/classes', __FILE__) +require_relative '../../spec_helper' +require_relative 'fixtures/classes' describe "Class#superclass" do it "returns the superclass of self" do diff --git a/spec/ruby/core/class/to_s_spec.rb b/spec/ruby/core/class/to_s_spec.rb index 693517f0da..2055593a03 100644 --- a/spec/ruby/core/class/to_s_spec.rb +++ b/spec/ruby/core/class/to_s_spec.rb @@ -1,5 +1,5 @@ -require File.expand_path('../../../spec_helper', __FILE__) -require File.expand_path('../fixtures/classes', __FILE__) +require_relative '../../spec_helper' +require_relative 'fixtures/classes' describe "Class#to_s" do it 'regular class returns same name as Module#to_s' do |