diff --git a/app/models/user/settings.rb b/app/models/user/settings.rb index 629b56326..a381acae3 100644 --- a/app/models/user/settings.rb +++ b/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 diff --git a/test/models/user/settings_test.rb b/test/models/user/settings_test.rb index 1df7471fd..b72de92c5 100644 --- a/test/models/user/settings_test.rb +++ b/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