Merge branch 'test-mail-smtp-pool-ruby-3-2' into 'master'

Test mail-smtp_pool on Ruby 3.1 and 3.2

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130045



Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Hitesh Raghuvanshi <hraghuvanshi@gitlab.com>
Approved-by: Stan Hu <stanhu@gmail.com>
Reviewed-by: Heinrich Lee Yu <heinrich@gitlab.com>
Co-authored-by: Heinrich Lee Yu <heinrich@gitlab.com>

Gemfile.lock

@@ -100,7 +100,7 @@ PATH
   specs:
     mail-smtp_pool (0.1.0)
       connection_pool (~> 2.0)
-      mail (~> 2.7)
+      mail (~> 2.8)
 
 PATH
   remote: vendor/gems/microsoft_graph_mailer

vendor/gems/mail-smtp_pool/.gitlab-ci.yml

@@ -3,8 +3,3 @@ include:
     inputs:
       gem_name: "mail-smtp_pool"
       gem_path_prefix: "vendor/gems/"
-
-rspec:
-  parallel:
-    matrix:
-      - RUBY_VERSION: ["3.0"] # 3.1 & 3.2 aren't supported yet

vendor/gems/mail-smtp_pool/Gemfile.lock

@@ -3,16 +3,29 @@ PATH
   specs:
     mail-smtp_pool (0.1.0)
       connection_pool (~> 2.0)
-      mail (~> 2.7)
+      mail (~> 2.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    connection_pool (2.2.3)
+    connection_pool (2.4.1)
+    date (3.3.3)
     diff-lcs (1.4.4)
-    mail (2.7.1)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
-    mini_mime (1.0.2)
+      net-imap
+      net-pop
+      net-smtp
+    mini_mime (1.1.5)
+    net-imap (0.3.7)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -26,6 +39,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
+    timeout (0.4.0)
 
 PLATFORMS
   ruby

vendor/gems/mail-smtp_pool/mail-smtp_pool.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   # Please maintain alphabetical order for dependencies
   spec.add_runtime_dependency 'connection_pool', '~> 2.0'
-  spec.add_runtime_dependency 'mail', '~> 2.7'
+  spec.add_runtime_dependency 'mail', '~> 2.8'
 
   # Please maintain alphabetical order for dev dependencies
   spec.add_development_dependency 'rspec', '~> 3.10.0'

vendor/gems/mail-smtp_pool/spec/lib/mail/smtp_pool/connection_spec.rb

@@ -14,7 +14,7 @@
   end
 
   after do
-    MockSMTP.clear_deliveries
+    MockSMTP.reset
   end
 
   describe '#deliver!' do
@@ -58,7 +58,7 @@
 
       context 'with an SMTP error' do
         before do
-          expect(mock_smtp).to receive(:rset).once.and_raise(Net::SMTPServerBusy)
+          expect(mock_smtp).to receive(:rset).once.and_raise(Net::SMTPServerBusy, nil)
         end
 
         it 'creates a new SMTP connection' do

vendor/gems/mail-smtp_pool/spec/lib/mail/smtp_pool_spec.rb

@@ -46,7 +46,7 @@
     end
 
     after do
-      MockSMTP.clear_deliveries
+      MockSMTP.reset
     end
 
     it 'delivers mail using a connection from the pool' do

vendor/gems/mail-smtp_pool/spec/spec_helper.rb

@@ -2,21 +2,46 @@
 
 require 'mail/smtp_pool'
 
+# Based on https://github.com/mikel/mail/blob/2.8.1/spec/spec_helper.rb#L73-L155
+class Net::SMTP
+  class << self
+    alias unstubbed_new new
+  end
+
+  def self.new(*args)
+    MockSMTP.new
+  end
+end
+
 # Original mockup from ActionMailer
-# Based on https://github.com/mikel/mail/blob/22a7afc23f253319965bf9228a0a430eec94e06d/spec/spec_helper.rb#L74-L138
 class MockSMTP
+  attr_accessor :open_timeout, :read_timeout
+
+  def self.reset
+    test = Net::SMTP.unstubbed_new('example.com')
+    @@tls = test.tls?
+    @@starttls = test.starttls?
+
+    @@deliveries = []
+    @started = false
+  end
+
+  reset
+
   def self.deliveries
     @@deliveries
   end
 
-  def self.security
-    @@security
+  def self.tls
+    @@tls
+  end
+
+  def self.starttls
+    @@starttls
   end
 
   def initialize
-    @@deliveries = []
-    @@security = nil
-    @started = false
+    self.class.reset
   end
 
   def sendmail(mail, from, to)
@@ -50,35 +75,29 @@ def finish
     return true
   end
 
-  def self.clear_deliveries
-    @@deliveries = []
-  end
-
-  def self.clear_security
-    @@security = nil
-  end
-
   def enable_tls(context)
-    raise ArgumentError, "SMTPS and STARTTLS is exclusive" if @@security && @@security != :enable_tls
-    @@security = :enable_tls
+    raise ArgumentError, "SMTPS and STARTTLS is exclusive" if @@starttls == :always
+    @@tls = true
     context
   end
 
+  def disable_tls
+    @@tls = false
+  end
+
   def enable_starttls(context = nil)
-    raise ArgumentError, "SMTPS and STARTTLS is exclusive" if @@security == :enable_tls
-    @@security = :enable_starttls
+    raise ArgumentError, "SMTPS and STARTTLS is exclusive" if @@tls
+    @@starttls = :always
     context
   end
 
   def enable_starttls_auto(context)
-    raise ArgumentError, "SMTPS and STARTTLS is exclusive" if @@security == :enable_tls
-    @@security = :enable_starttls_auto
+    raise ArgumentError, "SMTPS and STARTTLS is exclusive" if @@tls
+    @@starttls = :auto
     context
   end
-end
 
-class Net::SMTP
-  def self.new(*args)
-    MockSMTP.new
+  def disable_starttls
+    @@starttls = false
   end
 end