summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-02 05:18:04 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-02 05:18:04 +0000
commit34e57abf23ac9695ee67f64e33b6ddd85a88e7f6 (patch)
tree5188a551c1b38328aff1315431491a185892b423
parent673efdceef8ab206b4220dcbf5beb2df3dd2fa66 (diff)
* lib/net/smtp.rb (Net::SMTP#critical): Always return a
Net::SMTP::Response. Patch by Pawel Veselov. [ruby-trunk - Bug #9125] * test/net/smtp/test_smtp.rb: Test for the above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43954 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--lib/net/smtp.rb2
-rw-r--r--test/net/smtp/test_smtp.rb13
3 files changed, 21 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ea69988..bdbb439 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Dec 2 14:16:52 2013 Eric Hodel <drbrain@segment7.net>
+
+ * lib/net/smtp.rb (Net::SMTP#critical): Always return a
+ Net::SMTP::Response. Patch by Pawel Veselov.
+ [ruby-trunk - Bug #9125]
+ * test/net/smtp/test_smtp.rb: Test for the above.
+
Mon Dec 2 05:52:33 2013 Eric Hodel <drbrain@segment7.net>
* lib/rubygems: Update to RubyGems master baa965b. Notable changes:
diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb
index 4ed7e74..fdc911b 100644
--- a/lib/net/smtp.rb
+++ b/lib/net/smtp.rb
@@ -942,7 +942,7 @@ module Net
end
def critical
- return '200 dummy reply code' if @error_occurred
+ return Response.parse('200 dummy reply code') if @error_occurred
begin
return yield()
rescue Exception
diff --git a/test/net/smtp/test_smtp.rb b/test/net/smtp/test_smtp.rb
index 0b8d657..748b20d 100644
--- a/test/net/smtp/test_smtp.rb
+++ b/test/net/smtp/test_smtp.rb
@@ -21,6 +21,19 @@ module Net
end
end
+ def test_critical
+ smtp = Net::SMTP.new 'localhost', 25
+
+ assert_raises RuntimeError do
+ smtp.send :critical do
+ raise 'fail on purpose'
+ end
+ end
+
+ assert_kind_of Net::SMTP::Response, smtp.send(:critical),
+ '[Bug #9125]'
+ end
+
def test_esmtp
smtp = Net::SMTP.new 'localhost', 25
assert smtp.esmtp