FEATURE: More digest email frequency options. Digests can be sent as often as every 30 minutes.

This commit is contained in:
Neil Lalonde
2016-03-02 15:26:27 -05:00
parent be257225b6
commit c1aea91d63
15 changed files with 47 additions and 26 deletions

View File

@@ -3,11 +3,11 @@ require 'rails_helper'
describe DigestEmailSiteSetting do
describe 'valid_value?' do
it 'returns true for a valid value as an int' do
expect(DigestEmailSiteSetting.valid_value?(1)).to eq true
expect(DigestEmailSiteSetting.valid_value?(1440)).to eq true
end
it 'returns true for a valid value as a string' do
expect(DigestEmailSiteSetting.valid_value?('1')).to eq true
expect(DigestEmailSiteSetting.valid_value?('1440')).to eq true
end
it 'returns false for an invalid value' do

View File

@@ -1157,7 +1157,7 @@ describe User do
context "when user preferences are overriden" do
before do
SiteSetting.default_email_digest_frequency = 1 # daily
SiteSetting.default_email_digest_frequency = 1440 # daily
SiteSetting.default_email_private_messages = false
SiteSetting.default_email_direct = false
SiteSetting.default_email_mailing_list_mode = true
@@ -1183,7 +1183,7 @@ describe User do
options = user.user_option
expect(options.email_always).to eq(true)
expect(options.mailing_list_mode).to eq(true)
expect(options.digest_after_days).to eq(1)
expect(options.digest_after_minutes).to eq(1440)
expect(options.email_private_messages).to eq(false)
expect(options.external_links_in_new_tab).to eq(true)
expect(options.enable_quoting).to eq(false)