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/socket/tcpsocket/gethostbyname_spec.rb | 4 ++-- spec/ruby/library/socket/tcpsocket/new_spec.rb | 2 +- spec/ruby/library/socket/tcpsocket/open_spec.rb | 2 +- spec/ruby/library/socket/tcpsocket/partially_closable_spec.rb | 6 +++--- spec/ruby/library/socket/tcpsocket/recv_nonblock_spec.rb | 4 ++-- spec/ruby/library/socket/tcpsocket/setsockopt_spec.rb | 4 ++-- spec/ruby/library/socket/tcpsocket/shared/new.rb | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) (limited to 'spec/ruby/library/socket/tcpsocket') diff --git a/spec/ruby/library/socket/tcpsocket/gethostbyname_spec.rb b/spec/ruby/library/socket/tcpsocket/gethostbyname_spec.rb index 11838aca27..9f25280a70 100644 --- a/spec/ruby/library/socket/tcpsocket/gethostbyname_spec.rb +++ b/spec/ruby/library/socket/tcpsocket/gethostbyname_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' # TODO: verify these for windows describe "TCPSocket#gethostbyname" do diff --git a/spec/ruby/library/socket/tcpsocket/new_spec.rb b/spec/ruby/library/socket/tcpsocket/new_spec.rb index 279576272b..4924468be7 100644 --- a/spec/ruby/library/socket/tcpsocket/new_spec.rb +++ b/spec/ruby/library/socket/tcpsocket/new_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../shared/new', __FILE__) +require_relative 'shared/new' describe "TCPSocket.new" do it_behaves_like :tcpsocket_new, :new diff --git a/spec/ruby/library/socket/tcpsocket/open_spec.rb b/spec/ruby/library/socket/tcpsocket/open_spec.rb index fb4cc4629a..31b630a23b 100644 --- a/spec/ruby/library/socket/tcpsocket/open_spec.rb +++ b/spec/ruby/library/socket/tcpsocket/open_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../shared/new', __FILE__) +require_relative 'shared/new' describe "TCPSocket.open" do it_behaves_like :tcpsocket_new, :open diff --git a/spec/ruby/library/socket/tcpsocket/partially_closable_spec.rb b/spec/ruby/library/socket/tcpsocket/partially_closable_spec.rb index 6a43eea625..9416d5c71d 100644 --- a/spec/ruby/library/socket/tcpsocket/partially_closable_spec.rb +++ b/spec/ruby/library/socket/tcpsocket/partially_closable_spec.rb @@ -1,6 +1,6 @@ -require File.expand_path('../../../../spec_helper', __FILE__) -require File.expand_path('../../fixtures/classes', __FILE__) -require File.expand_path('../../shared/partially_closable_sockets', __FILE__) +require_relative '../../../spec_helper' +require_relative '../fixtures/classes' +require_relative '../shared/partially_closable_sockets' describe "TCPSocket partial closability" do diff --git a/spec/ruby/library/socket/tcpsocket/recv_nonblock_spec.rb b/spec/ruby/library/socket/tcpsocket/recv_nonblock_spec.rb index 237ff781a3..9ee7db8cf6 100644 --- a/spec/ruby/library/socket/tcpsocket/recv_nonblock_spec.rb +++ b/spec/ruby/library/socket/tcpsocket/recv_nonblock_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 "TCPSocket#recv_nonblock" do before :each do diff --git a/spec/ruby/library/socket/tcpsocket/setsockopt_spec.rb b/spec/ruby/library/socket/tcpsocket/setsockopt_spec.rb index 8a0cb443b5..c9b0ff16dc 100644 --- a/spec/ruby/library/socket/tcpsocket/setsockopt_spec.rb +++ b/spec/ruby/library/socket/tcpsocket/setsockopt_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 "TCPSocket#setsockopt" do before :each do diff --git a/spec/ruby/library/socket/tcpsocket/shared/new.rb b/spec/ruby/library/socket/tcpsocket/shared/new.rb index 912208c86c..c66479a2d8 100644 --- a/spec/ruby/library/socket/tcpsocket/shared/new.rb +++ b/spec/ruby/library/socket/tcpsocket/shared/new.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 :tcpsocket_new, shared: true do it "requires a hostname and a port as arguments" do -- cgit v1.2.3