@@ -87,7 +87,21 @@ describe "CapGun" do capistrano = { :current_release => "/data/foo", :previous_release => "/data/foo", :cap_gun_email_envelope => {:recipients => ["joe@example.com"]} } CapGun::Mailer.any_instance.expects(:create_body).with(capistrano).returns("foo") CapGun::Mailer.create_deployment_notification capistrano + end + + it "calls Net::SMTP to send the mail correctly (we test this because SMTP internals changed between 1.8.6 and newer versions of Ruby)" do + ActionMailer::Base.smtp_settings = { + :address => "smtp.gmail.com", + :port => 587, + :domain => "foo.com", + :authentication => :plain, + :user_name => "username", + :password => "password" + } + capistrano = { :current_release => "/data/foo", :previous_release => "/data/foo", :cap_gun_email_envelope => {:recipients => ["joe@example.com"]} } + Net::SMTP.expects(:start) + CapGun::Mailer.deliver_deployment_notification capistrano end end spec/cap_gun_spec.rb @@ -5,7 +5,13 @@ Net::SMTP.class_eval do private def do_start(helodomain, user, secret, authtype) raise IOError, 'SMTP session already started' if @started - check_auth_args user, secret, authtype if user or secret + if user or secret + if RUBY_VERSION == "1.8.7" + check_auth_args user, secret + else + check_auth_args user, secret, authtype + end + end sock = timeout(@open_timeout) { TCPSocket.open(@address, @port) } @socket = Net::InternetMessageIO.new(sock) vendor/action_mailer_tls/lib/smtp_tls.rb b10208aefcd5d13b7b81e4f721a9d59b00da7334 Rob Sanheim rsanheim@gmail.com http://github.com/relevance/cap_gun/commit/5b6866021cd9a7dc9fbc72c466bb1fda600044ea 5b6866021cd9a7dc9fbc72c466bb1fda600044ea 2008-10-05T14:17:08-07:00 2008-10-05T14:17:08-07:00 small smtp change to support ruby 1.8.7 (and up, hopefully) 93253331168bdd5da72d0e3e996357dec90b31b7 Rob Sanheim rsanheim@gmail.com