Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm

This commit is contained in:
negue
2019-01-27 18:14:51 +01:00
807 changed files with 41837 additions and 36396 deletions

View File

@@ -110,7 +110,7 @@ describe('slack', () => {
});
it('noops if no flagging url is provided', () => {
sandbox.stub(nconf, 'get').withArgs('SLACK:FLAGGING_URL').returns('');
sandbox.stub(nconf, 'get').withArgs('SLACK_FLAGGING_URL').returns('');
sandbox.stub(logger, 'error');
let reRequiredSlack = requireAgain('../../../../website/server/libs/slack');