From 2dd35a74533e63ad2b9b8804ef62b153ac926978 Mon Sep 17 00:00:00 2001 From: eregon Date: Wed, 20 Sep 2017 21:50:14 +0000 Subject: Prefer adapting specs to complicating library code * lib/net/ftp.rb (Net::FTP#initialize): simplify as per the original intent. * spec/ruby/library/net/ftp/initialize_spec.rb: adapt specs. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59981 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/net/ftp.rb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'lib/net/ftp.rb') diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index 31c4fb007e..cafe39fad0 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -262,13 +262,7 @@ module Net @ssl_handshake_timeout = options[:ssl_handshake_timeout] @read_timeout = options[:read_timeout] || 60 if host - if options[:port] - connect(host, options[:port] || FTP_PORT) - else - # spec/ruby/library/net/ftp/initialize_spec.rb depends on - # the number of arguments passed to connect.... - connect(host) - end + connect(host, options[:port] || FTP_PORT) if options[:username] login(options[:username], options[:password], options[:account]) end -- cgit v1.2.3