Merge branch 'develop' into party-chat-translations

# Conflicts:
#	website/server/controllers/api-v3/quests.js
#	website/server/controllers/api-v3/tasks/groups.js
#	website/server/controllers/api-v3/user/spells.js
#	website/server/models/group.js
This commit is contained in:
Mateus Etto
2018-04-25 21:15:49 +09:00
953 changed files with 37528 additions and 30517 deletions

View File

@@ -55,10 +55,15 @@ export function generateReq (options = {}) {
body: {},
query: {},
headers: {},
header: sandbox.stub().returns(null),
header (header) {
return this.headers[header];
},
session: {},
};
return defaultsDeep(options, defaultReq);
const req = defaultsDeep(options, defaultReq);
return req;
}
export function generateNext (func) {