diff options
author | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-04-28 19:50:06 +0000 |
---|---|---|
committer | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-04-28 19:50:06 +0000 |
commit | 4fbb9aa3cb6c31ec128bfb31f59efa66d66adba4 (patch) | |
tree | 84a654b260261fe172f2584f60b3ba93e59f841d /spec/ruby/library/net | |
parent | b864bd05bff2a61d55b08deb92e969f9fa55e07c (diff) | |
download | ruby-4fbb9aa3cb6c31ec128bfb31f59efa66d66adba4.tar.gz |
Update to ruby/spec@6f38a82
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec/ruby/library/net')
-rw-r--r-- | spec/ruby/library/net/ftp/default_passive_spec.rb | 8 | ||||
-rw-r--r-- | spec/ruby/library/net/ftp/passive_spec.rb | 12 | ||||
-rw-r--r-- | spec/ruby/library/net/http/http/open_timeout_spec.rb | 21 |
3 files changed, 10 insertions, 31 deletions
diff --git a/spec/ruby/library/net/ftp/default_passive_spec.rb b/spec/ruby/library/net/ftp/default_passive_spec.rb index af8925fc1e..30eb8f9da2 100644 --- a/spec/ruby/library/net/ftp/default_passive_spec.rb +++ b/spec/ruby/library/net/ftp/default_passive_spec.rb @@ -1,10 +1,8 @@ require_relative '../../../spec_helper' require_relative 'spec_helper' -ruby_version_is "2.3" do - describe "Net::FTP#default_passive" do - it "is true by default" do - ruby_exe(fixture(__FILE__, "default_passive.rb")).should == "true\ntrue\n" - end +describe "Net::FTP#default_passive" do + it "is true by default" do + ruby_exe(fixture(__FILE__, "default_passive.rb")).should == "true\ntrue\n" end end diff --git a/spec/ruby/library/net/ftp/passive_spec.rb b/spec/ruby/library/net/ftp/passive_spec.rb index 041b9552d5..e8db030cbd 100644 --- a/spec/ruby/library/net/ftp/passive_spec.rb +++ b/spec/ruby/library/net/ftp/passive_spec.rb @@ -10,16 +10,8 @@ describe "Net::FTP#passive" do ftp.passive.should be_true end - ruby_version_is ""..."2.3" do - it "is false by default" do - ruby_exe(fixture(__FILE__, "passive.rb")).should == "false" - end - end - - ruby_version_is "2.3" do - it "is the value of Net::FTP.default_value by default" do - ruby_exe(fixture(__FILE__, "passive.rb")).should == "true" - end + it "is the value of Net::FTP.default_value by default" do + ruby_exe(fixture(__FILE__, "passive.rb")).should == "true" end end diff --git a/spec/ruby/library/net/http/http/open_timeout_spec.rb b/spec/ruby/library/net/http/http/open_timeout_spec.rb index 333ad5c5b5..44b33615e6 100644 --- a/spec/ruby/library/net/http/http/open_timeout_spec.rb +++ b/spec/ruby/library/net/http/http/open_timeout_spec.rb @@ -2,22 +2,11 @@ require_relative '../../../../spec_helper' require 'net/http' describe "Net::HTTP#open_timeout" do - ruby_version_is ""..."2.3" do - it "returns the seconds to wait till the connection is open" do - net = Net::HTTP.new("localhost") - net.open_timeout.should be_nil - net.open_timeout = 10 - net.open_timeout.should eql(10) - end - end - - ruby_version_is "2.3" do - it "returns the seconds to wait till the connection is open" do - net = Net::HTTP.new("localhost") - net.open_timeout.should eql(60) - net.open_timeout = 10 - net.open_timeout.should eql(10) - end + it "returns the seconds to wait till the connection is open" do + net = Net::HTTP.new("localhost") + net.open_timeout.should eql(60) + net.open_timeout = 10 + net.open_timeout.should eql(10) end end |