test/action_mailer.rb in ar_mailer-1.3.3 vs test/action_mailer.rb in ar_mailer-1.4.0

@@ -1,7 +1,10 @@
 require 'net/smtp'
-require 'smtp_tls'
+begin
+  require 'smtp_tls'
+rescue LoadError
+end
 require 'time'
 
 class Net::SMTP
 
   @reset_called = 0
@@ -15,20 +18,14 @@
   class << self
 
     attr_reader :deliveries
     attr_reader :send_message_block
     attr_accessor :reset_called
+    attr_accessor :start_block
 
-    send :remove_method, :start
-
   end
 
-  def self.start(*args)
-    @start_block.call if @start_block
-    yield new(nil)
-  end
-
   def self.on_send_message(&block)
     @send_message_block = block
   end
 
   def self.on_start(&block)
@@ -38,9 +35,16 @@
   def self.reset
     deliveries.clear
     on_start
     on_send_message
     @reset_called = 0
+  end
+
+  alias test_old_start start
+
+  def start(*args)
+    self.class.start_block.call if self.class.start_block
+    yield self
   end
 
   alias test_old_reset reset if instance_methods.include? 'reset'
 
   def reset