Merge pull request #5263 from tgxworld/improve_pattern

REFACTOR: Always validate email by default.
This commit is contained in:
Guo Xiang Tan
2017-10-26 14:34:09 +08:00
committed by GitHub
4 changed files with 7 additions and 7 deletions

View File

@@ -67,7 +67,7 @@ describe User do
end
it "doesn't enqueue the system message when the site settings disable it" do
SiteSetting.expects(:send_welcome_message?).returns(false)
SiteSetting.send_welcome_message = false
Jobs.expects(:enqueue).with(:send_system_message, user_id: user.id, message_type: 'welcome_user').never
user.enqueue_welcome_message('welcome_user')
end