From 401b64c4e840bc8887219e9e445a64b3d5943656 Mon Sep 17 00:00:00 2001 From: eregon Date: Sun, 4 Mar 2018 15:09:32 +0000 Subject: Update to ruby/spec@c1b568b git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62656 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- spec/ruby/library/openstruct/delete_field_spec.rb | 2 +- spec/ruby/library/openstruct/element_reference_spec.rb | 2 +- spec/ruby/library/openstruct/element_set_spec.rb | 2 +- spec/ruby/library/openstruct/equal_value_spec.rb | 4 ++-- spec/ruby/library/openstruct/frozen_spec.rb | 2 +- spec/ruby/library/openstruct/initialize_spec.rb | 2 +- spec/ruby/library/openstruct/inspect_spec.rb | 6 +++--- spec/ruby/library/openstruct/marshal_dump_spec.rb | 2 +- spec/ruby/library/openstruct/marshal_load_spec.rb | 2 +- spec/ruby/library/openstruct/method_missing_spec.rb | 2 +- spec/ruby/library/openstruct/new_spec.rb | 2 +- spec/ruby/library/openstruct/to_h_spec.rb | 2 +- spec/ruby/library/openstruct/to_s_spec.rb | 6 +++--- 13 files changed, 18 insertions(+), 18 deletions(-) (limited to 'spec/ruby/library/openstruct') diff --git a/spec/ruby/library/openstruct/delete_field_spec.rb b/spec/ruby/library/openstruct/delete_field_spec.rb index a565f61b92..9ac80196cc 100644 --- a/spec/ruby/library/openstruct/delete_field_spec.rb +++ b/spec/ruby/library/openstruct/delete_field_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' require 'ostruct' describe "OpenStruct#delete_field" do diff --git a/spec/ruby/library/openstruct/element_reference_spec.rb b/spec/ruby/library/openstruct/element_reference_spec.rb index 431843547d..c425991b0f 100644 --- a/spec/ruby/library/openstruct/element_reference_spec.rb +++ b/spec/ruby/library/openstruct/element_reference_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' require "ostruct" describe "OpenStruct#[]" do diff --git a/spec/ruby/library/openstruct/element_set_spec.rb b/spec/ruby/library/openstruct/element_set_spec.rb index afa65247e4..eeb5a8b318 100644 --- a/spec/ruby/library/openstruct/element_set_spec.rb +++ b/spec/ruby/library/openstruct/element_set_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' require "ostruct" describe "OpenStruct#[]=" do diff --git a/spec/ruby/library/openstruct/equal_value_spec.rb b/spec/ruby/library/openstruct/equal_value_spec.rb index 0d2d1d881e..103ac13588 100644 --- a/spec/ruby/library/openstruct/equal_value_spec.rb +++ b/spec/ruby/library/openstruct/equal_value_spec.rb @@ -1,6 +1,6 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' require "ostruct" -require File.expand_path('../fixtures/classes', __FILE__) +require_relative 'fixtures/classes' describe "OpenStruct#==" do before :each do diff --git a/spec/ruby/library/openstruct/frozen_spec.rb b/spec/ruby/library/openstruct/frozen_spec.rb index 26dd556e97..27931fe5ac 100644 --- a/spec/ruby/library/openstruct/frozen_spec.rb +++ b/spec/ruby/library/openstruct/frozen_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' require 'ostruct' describe "OpenStruct.new when frozen" do diff --git a/spec/ruby/library/openstruct/initialize_spec.rb b/spec/ruby/library/openstruct/initialize_spec.rb index b5edde7618..dee5de48c6 100644 --- a/spec/ruby/library/openstruct/initialize_spec.rb +++ b/spec/ruby/library/openstruct/initialize_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' require 'ostruct' describe "OpenStruct#initialize" do diff --git a/spec/ruby/library/openstruct/inspect_spec.rb b/spec/ruby/library/openstruct/inspect_spec.rb index 826437b3c1..e2fed41528 100644 --- a/spec/ruby/library/openstruct/inspect_spec.rb +++ b/spec/ruby/library/openstruct/inspect_spec.rb @@ -1,7 +1,7 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' require 'ostruct' -require File.expand_path('../fixtures/classes', __FILE__) -require File.expand_path('../shared/inspect', __FILE__) +require_relative 'fixtures/classes' +require_relative 'shared/inspect' describe "OpenStruct#inspect" do it_behaves_like :ostruct_inspect, :inspect diff --git a/spec/ruby/library/openstruct/marshal_dump_spec.rb b/spec/ruby/library/openstruct/marshal_dump_spec.rb index cdc1564699..5c38fd959e 100644 --- a/spec/ruby/library/openstruct/marshal_dump_spec.rb +++ b/spec/ruby/library/openstruct/marshal_dump_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' require "ostruct" describe "OpenStruct#marshal_dump" do diff --git a/spec/ruby/library/openstruct/marshal_load_spec.rb b/spec/ruby/library/openstruct/marshal_load_spec.rb index 9c89697d8f..e07c4cef05 100644 --- a/spec/ruby/library/openstruct/marshal_load_spec.rb +++ b/spec/ruby/library/openstruct/marshal_load_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' require "ostruct" describe "OpenStruct#marshal_load when passed [Hash]" do diff --git a/spec/ruby/library/openstruct/method_missing_spec.rb b/spec/ruby/library/openstruct/method_missing_spec.rb index 6051fd48d8..eefe30661a 100644 --- a/spec/ruby/library/openstruct/method_missing_spec.rb +++ b/spec/ruby/library/openstruct/method_missing_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' require "ostruct" describe "OpenStruct#method_missing when called with a method name ending in '='" do diff --git a/spec/ruby/library/openstruct/new_spec.rb b/spec/ruby/library/openstruct/new_spec.rb index ce33634e08..5d2cacea40 100644 --- a/spec/ruby/library/openstruct/new_spec.rb +++ b/spec/ruby/library/openstruct/new_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' require 'ostruct' describe "OpenStruct.new when passed [Hash]" do diff --git a/spec/ruby/library/openstruct/to_h_spec.rb b/spec/ruby/library/openstruct/to_h_spec.rb index f1bffd6fa6..f3e157816b 100644 --- a/spec/ruby/library/openstruct/to_h_spec.rb +++ b/spec/ruby/library/openstruct/to_h_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' require 'ostruct' describe "OpenStruct#to_h" do diff --git a/spec/ruby/library/openstruct/to_s_spec.rb b/spec/ruby/library/openstruct/to_s_spec.rb index 8efa3f5aaf..73d91bf981 100644 --- a/spec/ruby/library/openstruct/to_s_spec.rb +++ b/spec/ruby/library/openstruct/to_s_spec.rb @@ -1,7 +1,7 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' require 'ostruct' -require File.expand_path('../fixtures/classes', __FILE__) -require File.expand_path('../shared/inspect', __FILE__) +require_relative 'fixtures/classes' +require_relative 'shared/inspect' describe "OpenStruct#to_s" do it_behaves_like :ostruct_inspect, :to_s -- cgit v1.2.3