diff --git a/app/models/user/settings.rb b/app/models/user/settings.rb index 1651e9a64..598ede9c5 100644 --- a/app/models/user/settings.rb +++ b/app/models/user/settings.rb @@ -21,7 +21,7 @@ class User::Settings < ApplicationRecord end def bundling_emails? - !bundle_email_never? && !user.system? && user.active? + !bundle_email_never? && !user.system? && user.active? && user.verified? end def timezone diff --git a/test/models/user/settings_test.rb b/test/models/user/settings_test.rb index b72de92c5..69145c419 100644 --- a/test/models/user/settings_test.rb +++ b/test/models/user/settings_test.rb @@ -49,5 +49,9 @@ class User::SettingsTest < ActiveSupport::TestCase @user.update!(role: :member, active: false) assert_not @user.settings.bundling_emails?, "Inactive users should not receive bundled emails" + + @user.update!(active: true) + @user.update_column(:verified_at, nil) + assert_not @user.settings.bundling_emails?, "Unverified users should not receive bundled emails" end end