tests: add ActionMailer metadata/event logging tests; fix Sorbet issues in test stubs; ensure coverage > 80%

Author: ndbroadbent

lefthook.yml

@@ -1,6 +1,4 @@
 colors: true
-skip_output:
-  - summary
 
 pre-commit:
   parallel: true

test/log_struct/integrations/action_mailer/event_logging_test.rb

@@ -0,0 +1,63 @@
+# typed: true
+# frozen_string_literal: true
+
+require "test_helper"
+require "action_mailer"
+
+class ActionMailerEventLoggingTest < ActiveSupport::TestCase
+  EventLogging = LogStruct::Integrations::ActionMailer::EventLogging
+  Callbacks = LogStruct::Integrations::ActionMailer::Callbacks
+
+  DummyMessage = Struct.new(:to, :cc, :bcc, :attachments, :subject, :from, :message_id)
+
+  class DummyMailer < ActionMailer::Base
+    include Callbacks
+    include EventLogging
+
+    def initialize(msg)
+      super()
+      @__msg = msg
+    end
+
+    def message = @__msg
+
+    def action_name = "sample"
+  end
+
+  setup do
+    @msg = DummyMessage.new(%w[a@b.com], nil, %w[x@y.com], [], "Welcome", ["noreply@example.com"], "m-1")
+    @mailer = DummyMailer.new(@msg)
+    # Capture logs as JSON
+    @orig_logger = ::Rails.logger
+    @buf = StringIO.new
+    logger = ::Logger.new(@buf)
+    logger.formatter = LogStruct::Formatter.new
+    ::Rails.logger = logger
+  end
+
+  teardown do
+    ::Rails.logger = @orig_logger
+  end
+
+  test "log_email_delivery builds ActionMailer log with Delivery event" do
+    @mailer.send(:log_email_delivery)
+    parsed = JSON.parse(@buf.string)
+
+    assert_equal "mailer", parsed["src"]
+    assert_equal "delivery", parsed["evt"]
+    assert_kind_of Array, parsed["to"]
+    assert_match(/\[EMAIL:/, parsed["to"].first)
+    assert_match(/\[EMAIL:/, parsed["from"])
+    assert_equal "Welcome", parsed["subject"]
+    assert_match(/DummyMailer\z/, parsed["mailer_class"])
+    assert_equal "sample", parsed["mailer_action"]
+    assert_equal "m-1", parsed["message_id"]
+  end
+
+  test "log_email_delivered builds ActionMailer log with Delivered event" do
+    @mailer.send(:log_email_delivered)
+    parsed = JSON.parse(@buf.string)
+
+    assert_equal "delivered", parsed["evt"]
+  end
+end

test/log_struct/integrations/action_mailer/metadata_collection_test.rb

@@ -0,0 +1,60 @@
+# typed: true
+# frozen_string_literal: true
+
+require "test_helper"
+require "action_mailer"
+
+class ActionMailerMetadataCollectionTest < ActiveSupport::TestCase
+  MetadataCollection = LogStruct::Integrations::ActionMailer::MetadataCollection
+
+  DummyMessage = Struct.new(:to, :cc, :bcc, :attachments, :subject, :from, :message_id)
+
+  test "add_message_metadata counts recipients and attachments when message present" do
+    msg = DummyMessage.new(%w[a@b.com], nil, %w[x@y.com], [1, 2], "S", ["from@example.com"], "mid")
+    data = {}
+    MetadataCollection.add_message_metadata(OpenStruct.new(message: msg), data)
+
+    assert_equal 2, data[:recipient_count]
+    assert data[:has_attachments]
+    assert_equal 2, data[:attachment_count]
+  end
+
+  test "add_message_metadata sets defaults when message missing" do
+    data = {}
+    MetadataCollection.add_message_metadata(OpenStruct.new, data)
+
+    assert_equal 0, data[:recipient_count]
+    refute data[:has_attachments]
+    assert_equal 0, data[:attachment_count]
+  end
+
+  test "add_context_metadata gathers tags and request_id when available" do
+    data = {}
+
+    # Stub ActiveSupport::TaggedLogging.current_tags
+    ActiveSupport::TaggedLogging.define_singleton_method(:current_tags) { ["req:abc"] }
+
+    # Stub ActionDispatch::Request.current_request_id
+    ActionDispatch::Request.define_singleton_method(:current_request_id) { "rid-123" }
+
+    MetadataCollection.add_context_metadata(Object.new, data)
+
+    assert_equal ["req:abc"], data[:tags]
+    assert_equal "rid-123", data[:request_id]
+  end
+
+  test "add_context_metadata includes job_id when ActiveJob::Logging.job_id is available" do
+    data = {}
+    # Ensure module exists
+    unless defined?(::ActiveJob::Logging)
+      module ::ActiveJob
+        module Logging; end
+      end
+    end
+    # Define job_id method on the module's singleton class
+    ::ActiveJob::Logging.define_singleton_method(:job_id) { "jid-1" }
+    MetadataCollection.add_context_metadata(Object.new, data)
+
+    assert_equal "jid-1", data[:job_id]
+  end
+end