Update tests to logging minitest helpers

Author: reidmorrison

Gemfile

@@ -8,8 +8,10 @@ gem "puma"
 gem "active_model_serializers"
 gem "amazing_print"
 gem "minitest"
+gem "minitest-rails"
 gem "rake"
 gem "sprockets", "< 4.0"
+gem "semantic_logger", github: "reidmorrison/semantic_logger"
 
 gem "rails", "~> 6.1.0"
 gem "sqlite3", "~> 1.4.0", platform: :ruby

gemfiles/rails_5.1.gemfile

@@ -7,8 +7,10 @@ gem "puma"
 gem "active_model_serializers"
 gem "amazing_print"
 gem "minitest"
+gem "minitest-rails"
 gem "rake"
 gem "sprockets", "< 4.0"
+gem "semantic_logger", github: "reidmorrison/semantic_logger"
 gem "rails", "~> 5.1.5"
 gem "sqlite3", "~> 1.3.0", platform: :ruby
 gem "activerecord-jdbcsqlite3-adapter", "~> 51.0", platform: :jruby

gemfiles/rails_5.2.gemfile

@@ -7,8 +7,10 @@ gem "puma"
 gem "active_model_serializers"
 gem "amazing_print"
 gem "minitest"
+gem "minitest-rails"
 gem "rake"
 gem "sprockets", "< 4.0"
+gem "semantic_logger", github: "reidmorrison/semantic_logger"
 gem "rails", "~> 5.2.0"
 gem "sqlite3", "~> 1.3.0", platform: :ruby
 gem "activerecord-jdbcsqlite3-adapter", "~> 52.0", platform: :jruby

gemfiles/rails_6.0.gemfile

@@ -7,8 +7,10 @@ gem "puma"
 gem "active_model_serializers"
 gem "amazing_print"
 gem "minitest"
+gem "minitest-rails"
 gem "rake"
 gem "sprockets", "< 4.0"
+gem "semantic_logger", github: "reidmorrison/semantic_logger"
 gem "rails", "~> 6.0.0"
 gem "sqlite3", "~> 1.4.0", platform: :ruby
 gem "activerecord-jdbcsqlite3-adapter", "~> 60.0", platform: :jruby

gemfiles/rails_6.1.gemfile

@@ -7,8 +7,10 @@ gem "puma"
 gem "active_model_serializers"
 gem "amazing_print"
 gem "minitest"
+gem "minitest-rails"
 gem "rake"
 gem "sprockets", "< 4.0"
+gem "semantic_logger", github: "reidmorrison/semantic_logger"
 gem "rails", "~> 6.1.0"
 gem "sqlite3", "~> 1.4.0", platform: :ruby
 gem "activerecord-jdbcsqlite3-adapter", "~> 61.0", platform: :jruby

gemfiles/rails_7.0.gemfile

@@ -7,8 +7,10 @@ gem "puma"
 gem "active_model_serializers"
 gem "amazing_print"
 gem "minitest"
+gem "minitest-rails"
 gem "rake"
 gem "sprockets", "< 4.0"
+gem "semantic_logger", github: "reidmorrison/semantic_logger"
 gem "rails", "~> 7.0.0"
 gem "sqlite3", "~> 1.4.0", platform: :ruby
 gem "thread_safe", "~> 0.3.6"

test/action_mailer_test.rb

@@ -8,16 +8,6 @@ def some_email(to:, from:, subject:)
   end
 
   describe "ActionMailer" do
-    before do
-      ::ActionMailer::Base.delivery_method = :test
-      @mock_logger = MockLogger.new
-      @appender    = SemanticLogger.add_appender(logger: @mock_logger, formatter: :raw)
-    end
-
-    after do
-      SemanticLogger.remove_appender(@appender)
-    end
-
     describe "#deliver" do
       it "sets the ActionMailer logger" do
         assert_kind_of SemanticLogger::Logger, MyMailer.logger
@@ -26,6 +16,40 @@ def some_email(to:, from:, subject:)
       it "sends the email" do
         MyMailer.some_email(to: 'test@test.com', from: 'test@test.com', subject: 'test').deliver_now
       end
+
+      it "writes log messages" do
+        messages = semantic_logger_events do
+          MyMailer.some_email(to: 'test@test.com', from: 'test@test.com', subject: 'test').deliver_now
+        end
+        assert_equal 2, messages.count, messages
+
+        assert_semantic_logger_event(
+          messages[0],
+          level: :info,
+          name: "ActionMailer::Base",
+          message_includes: "ActionMailerTest::MyMailer#some_email: processed outbound mail",
+          payload_includes: {
+            event_name: "process.action_mailer",
+            mailer: "ActionMailerTest::MyMailer",
+            action: :some_email,
+          }
+        )
+
+        assert_semantic_logger_event(
+          messages[1],
+          level: :info,
+          name: "ActionMailer::Base",
+          message_includes: Rails::VERSION::MAJOR >= 6 ? "Delivered mail" : "Skipped delivery",
+          payload_includes: {
+            event_name: "deliver.action_mailer",
+            mailer: "ActionMailerTest::MyMailer",
+            perform_deliveries: Rails::VERSION::MAJOR >= 6 ? true : nil,
+            subject: "test",
+            to: ["test@test.com"],
+            from: ["test@test.com"],
+          }
+        )
+      end
     end
 
     describe "Logging::LogSubscriber" do
@@ -36,11 +60,7 @@ def some_email(to:, from:, subject:)
       let(:subscriber) { RailsSemanticLogger::ActionMailer::LogSubscriber.new }
 
       let(:event) do
-        ActiveSupport::Notifications::Event.new event_name,
-                                                5.seconds.ago,
-                                                Time.zone.now,
-                                                SecureRandom.uuid,
-                                                payload
+        ActiveSupport::Notifications::Event.new(event_name, 5.seconds.ago, Time.zone.now, SecureRandom.uuid, payload)
       end
 
       let(:payload) do

test/active_job_test.rb

@@ -38,12 +38,6 @@ def id
   describe "ActiveJob" do
     before do
       skip "Older rails does not support ActiveJob" unless defined?(ActiveJob)
-      @mock_logger = MockLogger.new
-      @appender    = SemanticLogger.add_appender(logger: @mock_logger, formatter: :raw)
-    end
-
-    after do
-      SemanticLogger.remove_appender(@appender)
     end
 
     describe ".perform_now" do
@@ -64,11 +58,7 @@ def id
       let(:subscriber) { RailsSemanticLogger::ActiveJob::LogSubscriber.new }
 
       let(:event) do
-        ActiveSupport::Notifications::Event.new event_name,
-                                                5.seconds.ago,
-                                                Time.zone.now,
-                                                SecureRandom.uuid,
-                                                payload
+        ActiveSupport::Notifications::Event.new(event_name, 5.seconds.ago, Time.zone.now, SecureRandom.uuid, payload)
       end
 
       let(:event_name) { "enqueue.active_job" }
@@ -106,14 +96,28 @@ def id
           }
         end
 
-        specify do
-          subscriber.perform(event)
-
-          SemanticLogger.flush
-          actual = @mock_logger.message
-
-          assert_equal({name: "ArgumentError", message: "error", stack_trace: nil}, actual[:exception])
-          assert_equal("ActiveJobTest::MyJob", actual[:payload][:job_class])
+        it "logs messages" do
+          messages = semantic_logger_events do
+            subscriber.perform(event)
+          end
+          assert_equal 1, messages.count, messages
+
+          assert_semantic_logger_event(
+            messages[0],
+            level:            :error,
+            name:             "Rails",
+            message_includes: "Error performing ActiveJobTest::MyJob",
+            payload_includes: {
+              job_class:  "ActiveJobTest::MyJob",
+              queue:      "my_jobs",
+              event_name: "perform.active_job"
+            }
+          )
+          assert_includes messages[0].payload, :job_id
+
+          exception = messages[0].exception
+          assert exception.is_a?(ArgumentError)
+          assert_equal "error", exception.message
         end
       end