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/basicobject | |
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/core/basicobject')
-rw-r--r-- | spec/ruby/core/basicobject/__id__spec.rb | 4 | ||||
-rw-r--r-- | spec/ruby/core/basicobject/__send___spec.rb | 4 | ||||
-rw-r--r-- | spec/ruby/core/basicobject/basicobject_spec.rb | 4 | ||||
-rw-r--r-- | spec/ruby/core/basicobject/equal_spec.rb | 4 | ||||
-rw-r--r-- | spec/ruby/core/basicobject/equal_value_spec.rb | 4 | ||||
-rw-r--r-- | spec/ruby/core/basicobject/initialize_spec.rb | 2 | ||||
-rw-r--r-- | spec/ruby/core/basicobject/instance_eval_spec.rb | 4 | ||||
-rw-r--r-- | spec/ruby/core/basicobject/instance_exec_spec.rb | 4 | ||||
-rw-r--r-- | spec/ruby/core/basicobject/method_missing_spec.rb | 2 | ||||
-rw-r--r-- | spec/ruby/core/basicobject/not_equal_spec.rb | 2 | ||||
-rw-r--r-- | spec/ruby/core/basicobject/not_spec.rb | 2 | ||||
-rw-r--r-- | spec/ruby/core/basicobject/singleton_method_added_spec.rb | 4 | ||||
-rw-r--r-- | spec/ruby/core/basicobject/singleton_method_removed_spec.rb | 2 | ||||
-rw-r--r-- | spec/ruby/core/basicobject/singleton_method_undefined_spec.rb | 2 |
14 files changed, 22 insertions, 22 deletions
diff --git a/spec/ruby/core/basicobject/__id__spec.rb b/spec/ruby/core/basicobject/__id__spec.rb index fba9ed3b34..6766db4e82 100644 --- a/spec/ruby/core/basicobject/__id__spec.rb +++ b/spec/ruby/core/basicobject/__id__spec.rb @@ -1,5 +1,5 @@ -require File.expand_path('../../../spec_helper', __FILE__) -require File.expand_path('../../../shared/kernel/object_id', __FILE__) +require_relative '../../spec_helper' +require_relative '../../shared/kernel/object_id' describe "BasicObject#__id__" do it_behaves_like :object_id, :__id__, BasicObject diff --git a/spec/ruby/core/basicobject/__send___spec.rb b/spec/ruby/core/basicobject/__send___spec.rb index 26543ba5d5..005b1d0d90 100644 --- a/spec/ruby/core/basicobject/__send___spec.rb +++ b/spec/ruby/core/basicobject/__send___spec.rb @@ -1,5 +1,5 @@ -require File.expand_path('../../../spec_helper', __FILE__) -require File.expand_path('../../../shared/basicobject/send', __FILE__) +require_relative '../../spec_helper' +require_relative '../../shared/basicobject/send' describe "BasicObject#__send__" do it "is a public instance method" do diff --git a/spec/ruby/core/basicobject/basicobject_spec.rb b/spec/ruby/core/basicobject/basicobject_spec.rb index f58c17a0c0..860ad93e89 100644 --- a/spec/ruby/core/basicobject/basicobject_spec.rb +++ b/spec/ruby/core/basicobject/basicobject_spec.rb @@ -1,5 +1,5 @@ -require File.expand_path('../../../spec_helper', __FILE__) -require File.expand_path('../fixtures/common', __FILE__) +require_relative '../../spec_helper' +require_relative 'fixtures/common' describe "BasicObject" do it "raises NoMethodError for nonexistent methods after #method_missing is removed" do diff --git a/spec/ruby/core/basicobject/equal_spec.rb b/spec/ruby/core/basicobject/equal_spec.rb index 8120df836f..3c1ad56d4a 100644 --- a/spec/ruby/core/basicobject/equal_spec.rb +++ b/spec/ruby/core/basicobject/equal_spec.rb @@ -1,5 +1,5 @@ -require File.expand_path('../../../spec_helper', __FILE__) -require File.expand_path('../../../shared/kernel/equal', __FILE__) +require_relative '../../spec_helper' +require_relative '../../shared/kernel/equal' describe "BasicObject#equal?" do it "is a public instance method" do diff --git a/spec/ruby/core/basicobject/equal_value_spec.rb b/spec/ruby/core/basicobject/equal_value_spec.rb index 7d67634884..6c825513c1 100644 --- a/spec/ruby/core/basicobject/equal_value_spec.rb +++ b/spec/ruby/core/basicobject/equal_value_spec.rb @@ -1,5 +1,5 @@ -require File.expand_path('../../../spec_helper', __FILE__) -require File.expand_path('../../../shared/kernel/equal', __FILE__) +require_relative '../../spec_helper' +require_relative '../../shared/kernel/equal' describe "BasicObject#==" do it "is a public instance method" do diff --git a/spec/ruby/core/basicobject/initialize_spec.rb b/spec/ruby/core/basicobject/initialize_spec.rb index 7e6680df61..0266496856 100644 --- a/spec/ruby/core/basicobject/initialize_spec.rb +++ b/spec/ruby/core/basicobject/initialize_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' describe "BasicObject#initialize" do it "is a private instance method" do diff --git a/spec/ruby/core/basicobject/instance_eval_spec.rb b/spec/ruby/core/basicobject/instance_eval_spec.rb index 3898e96b8b..fc3af6fa83 100644 --- a/spec/ruby/core/basicobject/instance_eval_spec.rb +++ b/spec/ruby/core/basicobject/instance_eval_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 "BasicObject#instance_eval" do before :each do diff --git a/spec/ruby/core/basicobject/instance_exec_spec.rb b/spec/ruby/core/basicobject/instance_exec_spec.rb index f41af6f64f..33c6b5a1d3 100644 --- a/spec/ruby/core/basicobject/instance_exec_spec.rb +++ b/spec/ruby/core/basicobject/instance_exec_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 "BasicObject#instance_exec" do it "is a public instance method" do diff --git a/spec/ruby/core/basicobject/method_missing_spec.rb b/spec/ruby/core/basicobject/method_missing_spec.rb index eea45a8ddc..b048780ee8 100644 --- a/spec/ruby/core/basicobject/method_missing_spec.rb +++ b/spec/ruby/core/basicobject/method_missing_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../shared/basicobject/method_missing', __FILE__) +require_relative '../../shared/basicobject/method_missing' describe "BasicObject#method_missing" do it "is a private method" do diff --git a/spec/ruby/core/basicobject/not_equal_spec.rb b/spec/ruby/core/basicobject/not_equal_spec.rb index 9177380154..9329128c43 100644 --- a/spec/ruby/core/basicobject/not_equal_spec.rb +++ b/spec/ruby/core/basicobject/not_equal_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' describe "BasicObject#!=" do it "is a public instance method" do diff --git a/spec/ruby/core/basicobject/not_spec.rb b/spec/ruby/core/basicobject/not_spec.rb index f02b31edb2..ca4cb6f5ff 100644 --- a/spec/ruby/core/basicobject/not_spec.rb +++ b/spec/ruby/core/basicobject/not_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' describe "BasicObject#!" do it "is a public instance method" do diff --git a/spec/ruby/core/basicobject/singleton_method_added_spec.rb b/spec/ruby/core/basicobject/singleton_method_added_spec.rb index 7622798dee..8d256e22db 100644 --- a/spec/ruby/core/basicobject/singleton_method_added_spec.rb +++ b/spec/ruby/core/basicobject/singleton_method_added_spec.rb @@ -1,5 +1,5 @@ -require File.expand_path('../../../spec_helper', __FILE__) -require File.expand_path('../fixtures/singleton_method', __FILE__) +require_relative '../../spec_helper' +require_relative 'fixtures/singleton_method' describe "BasicObject#singleton_method_added" do before :each do diff --git a/spec/ruby/core/basicobject/singleton_method_removed_spec.rb b/spec/ruby/core/basicobject/singleton_method_removed_spec.rb index 406f4a888e..46f9a6894c 100644 --- a/spec/ruby/core/basicobject/singleton_method_removed_spec.rb +++ b/spec/ruby/core/basicobject/singleton_method_removed_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' describe "BasicObject#singleton_method_removed" do before :each do diff --git a/spec/ruby/core/basicobject/singleton_method_undefined_spec.rb b/spec/ruby/core/basicobject/singleton_method_undefined_spec.rb index 4f33cc5dbe..7d6c7207db 100644 --- a/spec/ruby/core/basicobject/singleton_method_undefined_spec.rb +++ b/spec/ruby/core/basicobject/singleton_method_undefined_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' describe "BasicObject#singleton_method_undefined" do before :each do |