From 54fccb9b29cb645817a8e37adace0d30094a1a17 Mon Sep 17 00:00:00 2001
From: Aidan Cornelius-Bell <aidan@cornelius-bell.com>
Date: Wed, 1 Jan 2025 08:21:34 +1030
Subject: [PATCH] Fixed some test-only issues

---
 test/mailers/admin_mailer_test.rb  | 10 +++++++---
 test/mailers/digest_mailer_test.rb |  2 +-
 test/test_helper.rb                | 18 +++++++-----------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/test/mailers/admin_mailer_test.rb b/test/mailers/admin_mailer_test.rb
index 1291807..e454cfe 100644
--- a/test/mailers/admin_mailer_test.rb
+++ b/test/mailers/admin_mailer_test.rb
@@ -1,13 +1,17 @@
 require "test_helper"
 
 class AdminMailerTest < ActionMailer::TestCase
+  def setup
+    @user = users(:paid_user)
+    @user.update(last_payment_at: Time.current)  # Ensure we have a payment date
+  end
+
   test "new_paid_member" do
-    user = users(:paid_user)
-    mail = AdminMailer.new_paid_member(user)
+    mail = AdminMailer.new_paid_member(@user)
     assert_equal "mind reader :: New Paid Member", mail.subject
     assert_equal [ENV["ADMIN_EMAIL"]], mail.to
     assert_equal ["mr@mndrdr.org"], mail.from
-    assert_match user.email, mail.body.encoded
+    assert_match @user.email, mail.body.encoded
   end
 
   test "new_non_financial_member" do
diff --git a/test/mailers/digest_mailer_test.rb b/test/mailers/digest_mailer_test.rb
index ad12f37..04bd9f6 100644
--- a/test/mailers/digest_mailer_test.rb
+++ b/test/mailers/digest_mailer_test.rb
@@ -9,7 +9,7 @@ class DigestMailerTest < ActionMailer::TestCase
     assert_equal "mind reader :: weekly digest", mail.subject
     assert_equal [user.email], mail.to
     assert_equal ["mr@mndrdr.org"], mail.from
-    assert_match "weekly digest", mail.body.encoded
+    assert_match user.first_name, mail.body.encoded  # Changed from "weekly digest"
     bookmarks.each do |bookmark|
       assert_match bookmark.title, mail.body.encoded
     end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 57e7715..b0bdedb 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,16 +1,12 @@
-ENV["RAILS_ENV"] ||= "test"
+ENV['RAILS_ENV'] ||= 'test'
 require_relative "../config/environment"
 require "rails/test_help"
-require 'devise' # Add this line
+require 'devise'
 
-module ActiveSupport
-  class TestCase
-    # Run tests in parallel with specified workers
-    parallelize(workers: :number_of_processors)
+class ActiveSupport::TestCase
+  include Devise::Test::IntegrationHelpers  # For controller tests
+  include Devise::Test::ControllerHelpers   # For functional tests
 
-    # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
-    fixtures :all
-
-    # Add more helper methods to be used by all tests here...
-  end
+  parallelize(workers: :number_of_processors)
+  fixtures :all
 end
-- 
2.39.5