fix: align testing code with now finished ruby/net-smtp gem

Author: TomFreudenberg

Gemfile

@@ -15,6 +15,6 @@ end
 group :testing do
   gem 'openssl'
   gem 'minitest'
-  gem 'net-smtp', github: 'TomFreudenberg/net-smtp', branch: 'master'
+  gem 'net-smtp', github: 'ruby/net-smtp', branch: 'master'
   gem 'mail'
 end

test/construct/base_integration_test_class.rb

@@ -34,7 +34,7 @@ def net_smtp_send_mail(envelope_mail_from, envelope_rcpt_to, message_data, authe
       @smtpd.ssl_context.extra_chain_cert&.each { |c| store.add_cert(c) }
     end
 
-    if Net::SMTP.const_defined?('VERSION') && (Net::SMTP::VERSION > '0.2.1')
+    if Net::SMTP.const_defined?('VERSION') && (Net::SMTP::VERSION >= '0.2.1')
       smtp.start('Integration Test client', authentication_id, password, auth_type, ssl_context_params: { cert_store: store, verify_mode: OpenSSL::SSL::VERIFY_PEER }) do
         # when sending mails, send one additional crlf to safe the original linebreaks
         smtp.send_message("#{message_data}\r\n", envelope_mail_from, envelope_rcpt_to)
@@ -51,7 +51,10 @@ def mikel_mail_send_mail(_envelope_mail_from, _envelope_rcpt_to, message_data, a
     m = Mail.read_from_string("#{message_data}\r\n")
 
     store = OpenSSL::X509::Store.new
-    store.add_cert(@smtpd.ssl_context.cert) if @smtpd.ssl_context
+    if @smtpd.ssl_context
+      store.add_cert(@smtpd.ssl_context.cert)
+      @smtpd.ssl_context.extra_chain_cert&.each { |c| store.add_cert(c) }
+    end
 
     m.delivery_method \
       :smtp,

test/construct/mail_smtp_class_patch.rb

@@ -11,7 +11,7 @@ module Mail
   class SMTP
 
     def start_smtp_session(&block)
-      if Net::SMTP.const_defined?('VERSION') && (Net::SMTP::VERSION > '0.2.1')
+      if Net::SMTP.const_defined?('VERSION') && (Net::SMTP::VERSION >= '0.2.1')
         build_smtp_session.start(settings[:domain], settings[:user_name], settings[:password], settings[:authentication], ssl_context_params: settings[:ssl_context_params], &block)
       else
         build_smtp_session.start(settings[:domain], settings[:user_name], settings[:password], settings[:authentication], &block)