Merge pull request #1437 from basecamp/flavorjones/2671-inactive-users-bundled-mailer

Do not bundle notifications for inactive users

app/models/user/settings.rb

@@ -20,7 +20,7 @@ class User::Settings < ApplicationRecord
   end
 
   def bundling_emails?
-    !bundle_email_never? && !user.system?
+    !bundle_email_never? && !user.system? && user.active?
   end
 
   def timezone

test/models/user/settings_test.rb

@@ -45,6 +45,9 @@ class User::SettingsTest < ActiveSupport::TestCase
     assert @user.settings.bundling_emails?
 
     @user.update!(role: :system)
-    assert_not @user.settings.bundling_emails?
+    assert_not @user.settings.bundling_emails?, "System users should not receive bundled emails"
+
+    @user.update!(role: :member, active: false)
+    assert_not @user.settings.bundling_emails?, "Inactive users should not receive bundled emails"
   end
 end