Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

res.respond: allow for thrid parameter (message), refactor shared ops responses and adapt tests

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-04-21 00:52:03 +02:00
parent 9e3d8ba4ac
commit 6568fcfd5e
81 changed files with 419 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/api/v3/integration/user/POST-user_allocate.test.js
+1 -1
View File
@@ -36,6 +36,6 @@ describe('POST /user/allocate', () => {
await user.sync();
expect(user.stats.con).to.equal(1);
expect(user.stats.points).to.equal(0);
expect(res.stats.con).to.equal(1);
expect(res.con).to.equal(1);
});
});
test/api/v3/integration/user/POST-user_allocate_now.test.js
+1 -5
View File
@@ -18,11 +18,7 @@ describe('POST /user/allocate-now', () => {
let res = await user.post('/user/allocate-now');
await user.sync();
expect(res).to.eql({
data: {
stats: user.stats,
},
});
expect(res).to.eql(user.stats);
expect(user.stats.points).to.equal(0);
expect(user.stats.con).to.equal(9);
expect(user.stats.int).to.equal(8);
test/api/v3/integration/user/POST-user_buy.test.js
+1 -3
View File
@@ -36,9 +36,7 @@ describe('POST /user/buy/:key', () => {
await user.sync();
expect(user.stats.hp).to.equal(50);
expect(res.data).to.eql({
stats: user.stats,
});
expect(res.data).to.eql(user.stats);
expect(res.message).to.equal(t('messageBought', {itemText: potion.text()}));
});
test/api/v3/integration/user/POST-user_buy_mystery_set.test.js
+1 -5
View File
@@ -31,11 +31,7 @@ describe('POST /user/buy-mystery-set/:key', () => {
expect(res.data).to.eql({
items: JSON.parse(JSON.stringify(user.items)), // otherwise dates can't be compared
purchased: {
plan: {
consecutive: user.purchased.plan.consecutive,
},
},
purchasedPlanConsecutive: user.purchased.plan.consecutive,
});
expect(res.message).to.equal(t('hourglassPurchaseSet'));
});
test/api/v3/integration/user/POST-user_buy_potion.test.js
+1 -3
View File
@@ -36,9 +36,7 @@ describe('POST /user/buy-potion', () => {
await user.sync();
expect(user.stats.hp).to.equal(50);
expect(res.data).to.eql({
stats: user.stats,
});
expect(res.data).to.eql(user.stats);
expect(res.message).to.equal(t('messageBought', {itemText: potion.text()}));
});
});
test/api/v3/integration/user/POST-user_change-class.test.js
+4 -4
View File
@@ -18,13 +18,13 @@ describe('POST /user/change-class', () => {
let res = await user.post('/user/change-class?class=rogue');
await user.sync();
expect(res).to.eql({
data: JSON.parse(JSON.stringify({
expect(res).to.eql(JSON.parse(
JSON.stringify({
preferences: user.preferences,
stats: user.stats,
flags: user.flags,
items: user.items,
})),
});
})
));
});
});
test/api/v3/integration/user/POST-user_disable-classes.test.js
+4 -4
View File
@@ -15,12 +15,12 @@ describe('POST /user/disable-classes', () => {
let res = await user.post('/user/disable-classes');
await user.sync();
expect(res).to.eql({
data: JSON.parse(JSON.stringify({
expect(res).to.eql(JSON.parse(
JSON.stringify({
preferences: user.preferences,
stats: user.stats,
flags: user.flags,
})),
});
})
));
});
});
test/api/v3/integration/user/POST-user_equip_type_key.test.js
+1 -3
View File
@@ -35,8 +35,6 @@ describe('POST /user/equip/:type/:key', () => {
let res = await user.post('/user/equip/equipped/weapon_warrior_2');
await user.sync();
expect(res).to.eql({
data: JSON.parse(JSON.stringify(user.items)),
});
expect(res).to.eql(JSON.parse(JSON.stringify(user.items)));
});
});
test/api/v3/integration/user/POST-user_sleep.test.js
+2 -6
View File
@@ -13,16 +13,12 @@ describe('POST /user/sleep', () => {
it('toggles sleep status', async () => {
let res = await user.post('/user/sleep');
expect(res).to.eql({
preferences: {sleep: true},
});
expect(res).to.eql(true);
await user.sync();
expect(user.preferences.sleep).to.be.true;
let res2 = await user.post('/user/sleep');
expect(res2).to.eql({
preferences: {sleep: false},
});
expect(res2).to.eql(false);
await user.sync();
expect(user.preferences.sleep).to.be.false;
});
test/api/v3/integration/user/auth/POST-user_reset_password.test.js
+2 -3
View File
@@ -16,7 +16,7 @@ describe('POST /user/reset-password', async () => {
let response = await user.post(endpoint, {
email: user.auth.local.email,
});
expect(response).to.eql({ message: t('passwordReset') });
expect(response).to.eql({ data: {}, message: t('passwordReset') });
await user.sync();
expect(user.auth.local.hashed_password).to.not.eql(previousPassword);
});
@@ -25,7 +25,7 @@ describe('POST /user/reset-password', async () => {
let response = await user.post(endpoint, {
email: 'nonExistent@email.com',
});
expect(response).to.eql({ message: t('passwordReset') });
expect(response).to.eql({ data: {}, message: t('passwordReset') });
});
it('errors if email is not provided', async () => {
@@ -36,4 +36,3 @@ describe('POST /user/reset-password', async () => {
});
});
});
test/api/v3/unit/middlewares/response.js
+15
View File
@@ -35,6 +35,21 @@ describe('response middleware', () => {
});
});
it('can be passed a third parameter to be used as optional message', () => {
responseMiddleware(req, res, next);
res.respond(200, {field: 1}, 'hello');
expect(res.status).to.be.calledOnce;
expect(res.json).to.be.calledOnce;
expect(res.status).to.be.calledWith(200);
expect(res.json).to.be.calledWith({
success: true,
data: {field: 1},
message: 'hello',
});
});
it('treats status >= 400 as failures', () => {
responseMiddleware(req, res, next);
res.respond(403, {field: 1});
test/api/v3/unit/models/challenge.test.js
+1 -1
View File
@@ -110,7 +110,7 @@ describe('Challenge Model', () => {
};
Tasks.Task.sanitize(req.body);
_.assign(task, common.ops.updateTask(task.toObject(), req));
_.assign(task, common.ops.updateTask(task.toObject(), req)[0]);
await challenge.updateTask(task);
test/common/ops/addPushDevice.js
+2 -2
View File
@@ -39,9 +39,9 @@ describe('shared.ops.addPushDevice', () => {
});
it('adds a push device', () => {
let response = addPushDevice(user, {body: {regId, type}});
let [, message] = addPushDevice(user, {body: {regId, type}});
expect(response.message).to.equal(i18n.t('pushDeviceAdded'));
expect(message).to.equal(i18n.t('pushDeviceAdded'));
expect(user.pushDevices[0].type).to.equal(type);
expect(user.pushDevices[0].regId).to.equal(regId);
});
test/common/ops/allocateNow.js
+2 -6
View File
@@ -18,17 +18,13 @@ describe('shared.ops.allocateNow', () => {
user.stats.str = 9;
user.preferences.allocationMode = 'flat';
let res = allocateNow(user);
let [data] = allocateNow(user);
expect(user.stats.points).to.equal(0);
expect(user.stats.con).to.equal(9);
expect(user.stats.int).to.equal(8);
expect(user.stats.per).to.equal(9);
expect(user.stats.str).to.equal(9);
expect(res).to.eql({
data: {
stats: user.stats,
},
});
expect(data).to.eql(user.stats);
});
});
test/common/ops/blockUser.test.js
+3 -3
View File
@@ -26,10 +26,10 @@ describe('shared.ops.blockUser', () => {
});
it('blocks user', () => {
let result = blockUser(user, { params: { uuid: blockedUser._id } });
let [result] = blockUser(user, { params: { uuid: blockedUser._id } });
expect(user.inbox.blocks).to.eql([blockedUser._id]);
expect(result).to.eql([blockedUser._id]);
result = blockUser(user, { params: { uuid: blockedUser2._id } });
[result] = blockUser(user, { params: { uuid: blockedUser2._id } });
expect(user.inbox.blocks).to.eql([blockedUser._id, blockedUser2._id]);
expect(result).to.eql([blockedUser._id, blockedUser2._id]);
});
@@ -37,7 +37,7 @@ describe('shared.ops.blockUser', () => {
it('blocks, then unblocks user', () => {
blockUser(user, { params: { uuid: blockedUser._id } });
expect(user.inbox.blocks).to.eql([blockedUser._id]);
let result = blockUser(user, { params: { uuid: blockedUser._id } });
let [result] = blockUser(user, { params: { uuid: blockedUser._id } });
expect(user.inbox.blocks).to.eql([]);
expect(result).to.eql([]);
});
test/common/ops/buySpecialSpell.js
+3 -3
View File
@@ -60,7 +60,7 @@ describe('shared.ops.buySpecialSpell', () => {
user.stats.gp = 11;
let item = content.special.thankyou;
let res = buySpecialSpell(user, {
let [data, message] = buySpecialSpell(user, {
params: {
key: 'thankyou',
},
@@ -68,11 +68,11 @@ describe('shared.ops.buySpecialSpell', () => {
expect(user.stats.gp).to.equal(1);
expect(user.items.special.thankyou).to.equal(1);
expect(res.data).to.eql({
expect(data).to.eql({
items: user.items,
stats: user.stats,
});
expect(res.message).to.equal(i18n.t('messageBought', {
expect(message).to.equal(i18n.t('messageBought', {
itemText: item.text(),
}));
});
test/common/ops/changeClass.js
+18 -24
View File
@@ -46,14 +46,12 @@ describe('shared.ops.changeClass', () => {
user.stats.class = 'healer';
user.items.gear.owned.armor_rogue_1 = true; // eslint-disable-line camelcase
let res = changeClass(user, {query: {class: 'rogue'}});
expect(res).to.eql({
data: {
preferences: user.preferences,
stats: user.stats,
flags: user.flags,
items: user.items,
},
let [data] = changeClass(user, {query: {class: 'rogue'}});
expect(data).to.eql({
preferences: user.preferences,
stats: user.stats,
flags: user.flags,
items: user.items,
});
expect(user.stats.class).to.equal('rogue');
@@ -80,14 +78,12 @@ describe('shared.ops.changeClass', () => {
user.stats.int = 4;
user.flags.classSelected = true;
let res = changeClass(user);
expect(res).to.eql({
data: {
preferences: user.preferences,
stats: user.stats,
flags: user.flags,
items: user.items,
},
let [data] = changeClass(user);
expect(data).to.eql({
preferences: user.preferences,
stats: user.stats,
flags: user.flags,
items: user.items,
});
expect(user.preferences.disableClasses).to.be.false;
@@ -122,14 +118,12 @@ describe('shared.ops.changeClass', () => {
user.stats.int = 4;
user.flags.classSelected = true;
let res = changeClass(user);
expect(res).to.eql({
data: {
preferences: user.preferences,
stats: user.stats,
flags: user.flags,
items: user.items,
},
let [data] = changeClass(user);
expect(data).to.eql({
preferences: user.preferences,
stats: user.stats,
flags: user.flags,
items: user.items,
});
expect(user.balance).to.equal(0.25);
test/common/ops/clearPMs.test.js
+1 -1
View File
@@ -13,7 +13,7 @@ describe('shared.ops.clearPMs', () => {
it('clears messages', () => {
expect(user.inbox.messages).to.not.eql({});
let result = clearPMs(user);
let [result] = clearPMs(user);
expect(user.inbox.messages).to.eql({});
expect(result).to.eql({});
});
test/common/ops/deletePM.test.js
+2 -2
View File
@@ -3,7 +3,7 @@ import {
generateUser,
} from '../../helpers/common.helper';
describe('shared.ops.clearPMs', () => {
describe('shared.ops.deletePM', () => {
let user;
beforeEach(() => {
@@ -13,7 +13,7 @@ describe('shared.ops.clearPMs', () => {
it('delete message', () => {
expect(user.inbox.messages).to.not.eql({ second: 'message' });
let response = deletePM(user, { params: { id: 'first' } });
let [response] = deletePM(user, { params: { id: 'first' } });
expect(user.inbox.messages).to.eql({ second: 'message' });
expect(response).to.eql({ second: 'message' });
});
test/common/ops/deleteWebhook.test.js
+2 -2
View File
@@ -14,8 +14,8 @@ describe('shared.ops.deleteWebhook', () => {
it('succeeds', () => {
user.preferences.webhooks = { 'some-id': {}, 'another-id': {} };
let res = deleteWebhook(user, req);
let [data] = deleteWebhook(user, req);
expect(user.preferences.webhooks).to.eql({'another-id': {}});
expect(res).to.equal(user.preferences.webhooks);
expect(data).to.equal(user.preferences.webhooks);
});
});
test/common/ops/disableClasses.js
+5 -7
View File
@@ -18,13 +18,11 @@ describe('shared.ops.disableClasses', () => {
user.preferences.autoAllocate = false;
user.stats.points = 2;
let res = disableClasses(user);
expect(res).to.eql({
data: {
preferences: user.preferences,
stats: user.stats,
flags: user.flags,
},
let [data] = disableClasses(user);
expect(data).to.eql({
preferences: user.preferences,
stats: user.stats,
flags: user.flags,
});
expect(user.stats.class).to.equal('warrior');
test/common/ops/equip.js
+12 -10
View File
@@ -37,20 +37,20 @@ describe('shared.ops.equip', () => {
equip(user, {params: {key: 'weapon_warrior_1'}});
// one-handed to one-handed
let res = equip(user, {params: {key: 'weapon_warrior_2'}});
expect(res.message).to.not.exists;
let [, message] = equip(user, {params: {key: 'weapon_warrior_2'}});
expect(message).to.not.exists;
// one-handed to two-handed
res = equip(user, {params: {key: 'weapon_wizard_1'}});
expect(res.message).to.not.exists;
[, message] = equip(user, {params: {key: 'weapon_wizard_1'}});
expect(message).to.not.exists;
// two-handed to two-handed
res = equip(user, {params: {key: 'weapon_wizard_2'}});
expect(res.message).to.not.exists;
[, message] = equip(user, {params: {key: 'weapon_wizard_2'}});
expect(message).to.not.exists;
// two-handed to one-handed
res = equip(user, {params: {key: 'weapon_warrior_2'}});
expect(res.message).to.not.exists;
[, message] = equip(user, {params: {key: 'weapon_warrior_2'}});
expect(message).to.not.exists;
});
it('should send messages if equipping a two-hander causes the off-hander to be unequipped', () => {
@@ -58,10 +58,11 @@ describe('shared.ops.equip', () => {
equip(user, {params: {key: 'shield_warrior_1'}});
// equipping two-hander
let res = equip(user, {params: {key: 'weapon_wizard_1'}});
let [data, message] = equip(user, {params: {key: 'weapon_wizard_1'}});
let weapon = content.gear.flat.weapon_wizard_1;
let item = content.gear.flat.shield_warrior_1;
let res = {data, message};
expect(res).to.eql({
message: i18n.t('messageTwoHandedEquip', {twoHandedText: weapon.text(), offHandedText: item.text()}),
data: user.items,
@@ -74,8 +75,9 @@ describe('shared.ops.equip', () => {
let weapon = content.gear.flat.weapon_wizard_1;
let shield = content.gear.flat.shield_warrior_1;
let res = equip(user, {params: {key: 'shield_warrior_1'}});
let [data, message] = equip(user, {params: {key: 'shield_warrior_1'}});
let res = {data, message};
expect(res).to.eql({
message: i18n.t('messageTwoHandedUnequip', {twoHandedText: weapon.text(), offHandedText: shield.text()}),
data: user.items,
test/common/ops/feed.js
+38 -48
View File
@@ -105,16 +105,14 @@ describe('shared.ops.feed', () => {
let potionText = content.hatchingPotions[potion] ? content.hatchingPotions[potion].text() : potion;
let eggText = content.eggs[egg] ? content.eggs[egg].text() : egg;
let res = feed(user, {params: {pet: 'Wolf-Base', food: 'Saddle'}});
expect(res).to.eql({
data: user.items.pets['Wolf-Base'],
message: i18n.t('messageEvolve', {
egg: i18n.t('petName', {
potion: potionText,
egg: eggText,
}),
let [data, message] = feed(user, {params: {pet: 'Wolf-Base', food: 'Saddle'}});
expect(data).to.eql(user.items.pets['Wolf-Base']);
expect(message).to.eql(i18n.t('messageEvolve', {
egg: i18n.t('petName', {
potion: potionText,
egg: eggText,
}),
});
}));
expect(user.items.food.Saddle).to.equal(1);
expect(user.items.pets['Wolf-Base']).to.equal(-1);
@@ -131,17 +129,15 @@ describe('shared.ops.feed', () => {
let potionText = content.hatchingPotions[potion] ? content.hatchingPotions[potion].text() : potion;
let eggText = content.eggs[egg] ? content.eggs[egg].text() : egg;
let res = feed(user, {params: {pet: 'Wolf-Base', food: 'Meat'}});
expect(res).to.eql({
data: user.items.pets['Wolf-Base'],
message: i18n.t('messageLikesFood', {
egg: i18n.t('petName', {
potion: potionText,
egg: eggText,
}),
foodText: food.text(),
let [data, message] = feed(user, {params: {pet: 'Wolf-Base', food: 'Meat'}});
expect(data).to.eql(user.items.pets['Wolf-Base']);
expect(message).to.eql(i18n.t('messageLikesFood', {
egg: i18n.t('petName', {
potion: potionText,
egg: eggText,
}),
});
foodText: food.text(),
}));
expect(user.items.food.Meat).to.equal(1);
expect(user.items.pets['Wolf-Base']).to.equal(10);
@@ -156,17 +152,15 @@ describe('shared.ops.feed', () => {
let potionText = content.hatchingPotions[potion] ? content.hatchingPotions[potion].text() : potion;
let eggText = content.eggs[egg] ? content.eggs[egg].text() : egg;
let res = feed(user, {params: {pet: 'Wolf-Spooky', food: 'Milk'}});
expect(res).to.eql({
data: user.items.pets['Wolf-Spooky'],
message: i18n.t('messageLikesFood', {
egg: i18n.t('petName', {
potion: potionText,
egg: eggText,
}),
foodText: food.text(),
let [data, message] = feed(user, {params: {pet: 'Wolf-Spooky', food: 'Milk'}});
expect(data).to.eql(user.items.pets['Wolf-Spooky']);
expect(message).to.eql(i18n.t('messageLikesFood', {
egg: i18n.t('petName', {
potion: potionText,
egg: eggText,
}),
});
foodText: food.text(),
}));
expect(user.items.food.Milk).to.equal(1);
expect(user.items.pets['Wolf-Spooky']).to.equal(10);
@@ -181,17 +175,15 @@ describe('shared.ops.feed', () => {
let potionText = content.hatchingPotions[potion] ? content.hatchingPotions[potion].text() : potion;
let eggText = content.eggs[egg] ? content.eggs[egg].text() : egg;
let res = feed(user, {params: {pet: 'Wolf-Base', food: 'Milk'}});
expect(res).to.eql({
data: user.items.pets['Wolf-Base'],
message: i18n.t('messageDontEnjoyFood', {
egg: i18n.t('petName', {
potion: potionText,
egg: eggText,
}),
foodText: food.text(),
let [data, message] = feed(user, {params: {pet: 'Wolf-Base', food: 'Milk'}});
expect(data).to.eql(user.items.pets['Wolf-Base']);
expect(message).to.eql(i18n.t('messageDontEnjoyFood', {
egg: i18n.t('petName', {
potion: potionText,
egg: eggText,
}),
});
foodText: food.text(),
}));
expect(user.items.food.Milk).to.equal(1);
expect(user.items.pets['Wolf-Base']).to.equal(7);
@@ -206,16 +198,14 @@ describe('shared.ops.feed', () => {
let potionText = content.hatchingPotions[potion] ? content.hatchingPotions[potion].text() : potion;
let eggText = content.eggs[egg] ? content.eggs[egg].text() : egg;
let res = feed(user, {params: {pet: 'Wolf-Base', food: 'Milk'}});
expect(res).to.eql({
data: user.items.pets['Wolf-Base'],
message: i18n.t('messageEvolve', {
egg: i18n.t('petName', {
potion: potionText,
egg: eggText,
}),
let [data, message] = feed(user, {params: {pet: 'Wolf-Base', food: 'Milk'}});
expect(data).to.eql(user.items.pets['Wolf-Base']);
expect(message).to.eql(i18n.t('messageEvolve', {
egg: i18n.t('petName', {
potion: potionText,
egg: eggText,
}),
});
}));
expect(user.items.food.Milk).to.equal(1);
expect(user.items.pets['Wolf-Base']).to.equal(-1);
test/common/ops/hatch.js
+12 -12
View File
@@ -99,9 +99,9 @@ describe('shared.ops.hatch', () => {
user.items.eggs = {Wolf: 1};
user.items.hatchingPotions = {Base: 1};
user.items.pets = {};
let res = hatch(user, {params: {egg: 'Wolf', hatchingPotion: 'Base'}});
expect(res.message).to.equal(i18n.t('messageHatched'));
expect(res.data).to.eql(user.items);
let [data, message] = hatch(user, {params: {egg: 'Wolf', hatchingPotion: 'Base'}});
expect(message).to.equal(i18n.t('messageHatched'));
expect(data).to.eql(user.items);
expect(user.items.pets).to.eql({'Wolf-Base': 5});
expect(user.items.eggs).to.eql({Wolf: 0});
expect(user.items.hatchingPotions).to.eql({Base: 0});
@@ -111,9 +111,9 @@ describe('shared.ops.hatch', () => {
user.items.eggs = {Cheetah: 1};
user.items.hatchingPotions = {Base: 1};
user.items.pets = {};
let res = hatch(user, {params: {egg: 'Cheetah', hatchingPotion: 'Base'}});
expect(res.message).to.equal(i18n.t('messageHatched'));
expect(res.data).to.eql(user.items);
let [data, message] = hatch(user, {params: {egg: 'Cheetah', hatchingPotion: 'Base'}});
expect(message).to.equal(i18n.t('messageHatched'));
expect(data).to.eql(user.items);
expect(user.items.pets).to.eql({'Cheetah-Base': 5});
expect(user.items.eggs).to.eql({Cheetah: 0});
expect(user.items.hatchingPotions).to.eql({Base: 0});
@@ -123,9 +123,9 @@ describe('shared.ops.hatch', () => {
user.items.eggs = {Wolf: 1};
user.items.hatchingPotions = {Spooky: 1};
user.items.pets = {};
let res = hatch(user, {params: {egg: 'Wolf', hatchingPotion: 'Spooky'}});
expect(res.message).to.equal(i18n.t('messageHatched'));
expect(res.data).to.eql(user.items);
let [data, message] = hatch(user, {params: {egg: 'Wolf', hatchingPotion: 'Spooky'}});
expect(message).to.equal(i18n.t('messageHatched'));
expect(data).to.eql(user.items);
expect(user.items.pets).to.eql({'Wolf-Spooky': 5});
expect(user.items.eggs).to.eql({Wolf: 0});
expect(user.items.hatchingPotions).to.eql({Spooky: 0});
@@ -135,9 +135,9 @@ describe('shared.ops.hatch', () => {
user.items.eggs = {Wolf: 1};
user.items.hatchingPotions = {Base: 1};
user.items.pets = {'Wolf-Base': -1};
let res = hatch(user, {params: {egg: 'Wolf', hatchingPotion: 'Base'}});
expect(res.message).to.eql(i18n.t('messageHatched'));
expect(res.data).to.eql(user.items);
let [data, message] = hatch(user, {params: {egg: 'Wolf', hatchingPotion: 'Base'}});
expect(message).to.eql(i18n.t('messageHatched'));
expect(data).to.eql(user.items);
expect(user.items.pets).to.eql({'Wolf-Base': 5});
expect(user.items.eggs).to.eql({Wolf: 0});
expect(user.items.hatchingPotions).to.eql({Base: 0});
test/common/ops/hourglassPurchase.js
+4 -4
View File
@@ -126,9 +126,9 @@ describe('user.ops.hourglassPurchase', () => {
it('buys a pet', () => {
user.purchased.plan.consecutive.trinkets = 2;
let response = hourglassPurchase(user, {params: {type: 'pets', key: 'MantisShrimp-Base'}});
let [, message] = hourglassPurchase(user, {params: {type: 'pets', key: 'MantisShrimp-Base'}});
expect(response.message).to.eql(i18n.t('hourglassPurchase'));
expect(message).to.eql(i18n.t('hourglassPurchase'));
expect(user.purchased.plan.consecutive.trinkets).to.eql(1);
expect(user.items.pets).to.eql({'MantisShrimp-Base': 5});
});
@@ -136,8 +136,8 @@ describe('user.ops.hourglassPurchase', () => {
it('buys a mount', () => {
user.purchased.plan.consecutive.trinkets = 2;
let response = hourglassPurchase(user, {params: {type: 'mounts', key: 'MantisShrimp-Base'}});
expect(response.message).to.eql(i18n.t('hourglassPurchase'));
let [, message] = hourglassPurchase(user, {params: {type: 'mounts', key: 'MantisShrimp-Base'}});
expect(message).to.eql(i18n.t('hourglassPurchase'));
expect(user.purchased.plan.consecutive.trinkets).to.eql(1);
expect(user.items.mounts).to.eql({'MantisShrimp-Base': true});
});
test/common/ops/openMysteryItem.js
+3 -3
View File
@@ -29,10 +29,10 @@ describe('shared.ops.openMysteryItem', () => {
user.purchased.plan.mysteryItems = [mysteryItemKey];
let response = openMysteryItem(user);
let [data, message] = openMysteryItem(user);
expect(user.items.gear.owned[mysteryItemKey]).to.be.true;
expect(response.message).to.equal(i18n.t('mysteryItemOpened'));
expect(response.data).to.equal(user.items.gear.owned);
expect(message).to.equal(i18n.t('mysteryItemOpened'));
expect(data).to.equal(user.items.gear.owned);
});
});
test/common/ops/purchase.js
+14 -14
View File
@@ -10,7 +10,7 @@ import {
generateUser,
} from '../../helpers/common.helper';
describe('shared.ops.feed', () => {
describe('shared.ops.purchase', () => {
let user;
let goldPoints = 40;
let gemsBought = 40;
@@ -128,7 +128,7 @@ describe('shared.ops.feed', () => {
});
});
context('successful feeding', () => {
context('successful purchase', () => {
let userGemAmount = 10;
before(() => {
@@ -138,9 +138,9 @@ describe('shared.ops.feed', () => {
});
it('purchases gems', () => {
let purchaseResponse = purchase(user, {params: {type: 'gems', key: 'gem'}});
let [, message] = purchase(user, {params: {type: 'gems', key: 'gem'}});
expect(purchaseResponse.message).to.equal(i18n.t('plusOneGem'));
expect(message).to.equal(i18n.t('plusOneGem'));
expect(user.balance).to.equal(userGemAmount + 0.25);
expect(user.purchased.plan.gemsBought).to.equal(1);
expect(user.stats.gp).to.equal(goldPoints - planGemLimits.convRate);
@@ -150,9 +150,9 @@ describe('shared.ops.feed', () => {
let type = 'eggs';
let key = 'Wolf';
let purchaseResponse = purchase(user, {params: {type, key}});
let [, message] = purchase(user, {params: {type, key}});
expect(purchaseResponse.message).to.equal(i18n.t('purchased', {type, key}));
expect(message).to.equal(i18n.t('purchased', {type, key}));
expect(user.items[type][key]).to.equal(1);
});
@@ -160,9 +160,9 @@ describe('shared.ops.feed', () => {
let type = 'hatchingPotions';
let key = 'Base';
let purchaseResponse = purchase(user, {params: {type, key}});
let [, message] = purchase(user, {params: {type, key}});
expect(purchaseResponse.message).to.equal(i18n.t('purchased', {type, key}));
expect(message).to.equal(i18n.t('purchased', {type, key}));
expect(user.items[type][key]).to.equal(1);
});
@@ -170,9 +170,9 @@ describe('shared.ops.feed', () => {
let type = 'food';
let key = 'Meat';
let purchaseResponse = purchase(user, {params: {type, key}});
let [, message] = purchase(user, {params: {type, key}});
expect(purchaseResponse.message).to.equal(i18n.t('purchased', {type, key}));
expect(message).to.equal(i18n.t('purchased', {type, key}));
expect(user.items[type][key]).to.equal(1);
});
@@ -180,9 +180,9 @@ describe('shared.ops.feed', () => {
let type = 'quests';
let key = 'gryphon';
let purchaseResponse = purchase(user, {params: {type, key}});
let [, message] = purchase(user, {params: {type, key}});
expect(purchaseResponse.message).to.equal(i18n.t('purchased', {type, key}));
expect(message).to.equal(i18n.t('purchased', {type, key}));
expect(user.items[type][key]).to.equal(1);
});
@@ -190,9 +190,9 @@ describe('shared.ops.feed', () => {
let type = 'gear';
let key = 'headAccessory_special_tigerEars';
let purchaseResponse = purchase(user, {params: {type, key}});
let [, message] = purchase(user, {params: {type, key}});
expect(purchaseResponse.message).to.equal(i18n.t('purchased', {type, key}));
expect(message).to.equal(i18n.t('purchased', {type, key}));
expect(user.items.gear.owned[key]).to.be.true;
});
});
test/common/ops/readCard.js
+2 -2
View File
@@ -39,9 +39,9 @@ describe('shared.ops.readCard', () => {
});
it('reads a card', () => {
let response = readCard(user, {params: {cardType: 'greeting'}});
let [, message] = readCard(user, {params: {cardType: 'greeting'}});
expect(response.message).to.equal(i18n.t('readCard', {cardType}));
expect(message).to.equal(i18n.t('readCard', {cardType}));
expect(user.items.special[`${cardType}Received`]).to.be.empty;
expect(user.flags.cardReceived).to.be.false;
});
test/common/ops/rebirth.js
+4 -4
View File
@@ -35,18 +35,18 @@ describe('shared.ops.rebirth', () => {
});
it('rebirths a user with enough gems', () => {
let response = rebirth(user);
let [, message] = rebirth(user);
expect(response.message).to.equal(i18n.t('rebirthComplete'));
expect(message).to.equal(i18n.t('rebirthComplete'));
});
it('rebirths a user with not enough gems but max level', () => {
user.balance = 0;
user.stats.lvl = MAX_LEVEL;
let response = rebirth(user);
let [, message] = rebirth(user);
expect(response.message).to.equal(i18n.t('rebirthComplete'));
expect(message).to.equal(i18n.t('rebirthComplete'));
});
it('resets user\'s taks values except for rewards to 0', () => {
test/common/ops/releaseBoth.js
+8 -8
View File
@@ -33,9 +33,9 @@ describe('shared.ops.releaseBoth', () => {
});
it('grants triad bingo with gems', () => {
let response = releaseBoth(user);
let [, message] = releaseBoth(user);
expect(response.message).to.equal(i18n.t('mountsAndPetsReleased'));
expect(message).to.equal(i18n.t('mountsAndPetsReleased'));
expect(user.achievements.triadBingoCount).to.equal(1);
});
@@ -44,24 +44,24 @@ describe('shared.ops.releaseBoth', () => {
user.achievements.triadBingo = 1;
user.achievements.triadBingoCount = 1;
let response = releaseBoth(user);
let [, message] = releaseBoth(user);
expect(response.message).to.equal(i18n.t('mountsAndPetsReleased'));
expect(message).to.equal(i18n.t('mountsAndPetsReleased'));
expect(user.achievements.triadBingoCount).to.equal(2);
});
it('releases pets', () => {
let response = releaseBoth(user);
let [, message] = releaseBoth(user);
expect(response.message).to.equal(i18n.t('mountsAndPetsReleased'));
expect(message).to.equal(i18n.t('mountsAndPetsReleased'));
expect(user.items.pets[animal]).to.be.empty;
expect(user.items.mounts[animal]).to.equal(null);
});
it('releases mounts', () => {
let response = releaseBoth(user);
let [, message] = releaseBoth(user);
expect(response.message).to.equal(i18n.t('mountsAndPetsReleased'));
expect(message).to.equal(i18n.t('mountsAndPetsReleased'));
expect(user.items.mounts[animal]).to.equal(null);
});
test/common/ops/releaseMounts.js
+2 -2
View File
@@ -31,9 +31,9 @@ describe('shared.ops.releaseMounts', () => {
});
it('releases mounts', () => {
let response = releaseMounts(user);
let [, message] = releaseMounts(user);
expect(response.message).to.equal(i18n.t('mountsReleased'));
expect(message).to.equal(i18n.t('mountsReleased'));
expect(user.items.mounts[animal]).to.equal(null);
});
test/common/ops/releasePets.js
+2 -2
View File
@@ -31,9 +31,9 @@ describe('shared.ops.releasePets', () => {
});
it('releases pets', () => {
let response = releasePets(user);
let [, message] = releasePets(user);
expect(response.message).to.equal(i18n.t('petsReleased'));
expect(message).to.equal(i18n.t('petsReleased'));
expect(user.items.pets[animal]).to.equal(0);
});
test/common/ops/reroll.js
+2 -2
View File
@@ -32,9 +32,9 @@ describe('shared.ops.reroll', () => {
});
it('rerolls a user with enough gems', () => {
let response = reroll(user);
let [, message] = reroll(user);
expect(response.message).to.equal(i18n.t('rerollComplete'));
expect(message).to.equal(i18n.t('rerollComplete'));
});
it('reduces a user\'s balance', () => {
test/common/ops/reset.js
+2 -2
View File
@@ -31,9 +31,9 @@ describe('shared.ops.reset', () => {
it('resets a user', () => {
let response = reset(user);
let [, message] = reset(user);
expect(response.message).to.equal(i18n.t('resetComplete'));
expect(message).to.equal(i18n.t('resetComplete'));
});
it('resets user\'s health', () => {
test/common/ops/revive.js
+6 -6
View File
@@ -57,9 +57,9 @@ describe('shared.ops.revive', () => {
let weaponKey = 'weapon_warrior_0';
user.items.gear.owned[weaponKey] = true;
let reviveRequest = revive(user);
let [, message] = revive(user);
expect(reviveRequest.message).to.equal(i18n.t('messageLostItem', { itemText: content.gear.flat[weaponKey].text()}));
expect(message).to.equal(i18n.t('messageLostItem', { itemText: content.gear.flat[weaponKey].text()}));
expect(user.items.gear.owned[weaponKey]).to.be.false;
});
@@ -70,9 +70,9 @@ describe('shared.ops.revive', () => {
user.items.gear.owned[weaponKey] = true;
user.items.gear.equipped[itemToLose.type] = itemToLose.key;
let reviveRequest = revive(user);
let [, message] = revive(user);
expect(reviveRequest.message).to.equal(i18n.t('messageLostItem', { itemText: itemToLose.text()}));
expect(message).to.equal(i18n.t('messageLostItem', { itemText: itemToLose.text()}));
expect(user.items.gear.equipped[itemToLose.type]).to.equal(`${itemToLose.type}_base_0`);
});
@@ -83,9 +83,9 @@ describe('shared.ops.revive', () => {
user.items.gear.owned[weaponKey] = true;
user.items.gear.costume[itemToLose.type] = itemToLose.key;
let reviveRequest = revive(user);
let [, message] = revive(user);
expect(reviveRequest.message).to.equal(i18n.t('messageLostItem', { itemText: itemToLose.text()}));
expect(message).to.equal(i18n.t('messageLostItem', { itemText: itemToLose.text()}));
expect(user.items.gear.costume[itemToLose.type]).to.equal(`${itemToLose.type}_base_0`);
});
});
test/common/ops/sell.js
+4 -4
View File
@@ -66,16 +66,16 @@ describe('shared.ops.sell', () => {
});
it('reduces item count from user', () => {
let response = sell(user, {params: { type, key } });
let [, message] = sell(user, {params: { type, key } });
expect(response.message).to.equal(i18n.t('sold', {type, key}));
expect(message).to.equal(i18n.t('sold', {type, key}));
expect(user.items[type][key]).to.equal(0);
});
it('increases user\'s gold', () => {
let response = sell(user, {params: { type, key } });
let [, message] = sell(user, {params: { type, key } });
expect(response.message).to.equal(i18n.t('sold', {type, key}));
expect(message).to.equal(i18n.t('sold', {type, key}));
expect(user.stats.gp).to.equal(content[type][key].value);
});
});
test/common/ops/sleep.js
+4 -4
View File
@@ -7,12 +7,12 @@ describe('shared.ops.sleep', () => {
it('toggles user.preferences.sleep', () => {
let user = generateUser();
let res = sleep(user);
expect(res).to.eql({preferences: {sleep: true}});
let [res] = sleep(user);
expect(res).to.eql(true);
expect(user.preferences.sleep).to.equal(true);
let res2 = sleep(user);
expect(res2).to.eql({preferences: {sleep: false}});
let [res2] = sleep(user);
expect(res2).to.eql(false);
expect(user.preferences.sleep).to.equal(false);
});
});
test/common/ops/unlock.js
+8 -8
View File
@@ -55,30 +55,30 @@ describe('shared.ops.unlock', () => {
});
it('unlocks a full set', () => {
let response = unlock(user, {query: {path: unlockPath}});
let [, message] = unlock(user, {query: {path: unlockPath}});
expect(response.message).to.equal(i18n.t('unlocked'));
expect(message).to.equal(i18n.t('unlocked'));
expect(user.purchased.shirt.convict).to.be.true;
});
it('unlocks a full set of gear', () => {
let response = unlock(user, {query: {path: unlockGearSetPath}});
let [, message] = unlock(user, {query: {path: unlockGearSetPath}});
expect(response.message).to.equal(i18n.t('unlocked'));
expect(message).to.equal(i18n.t('unlocked'));
expect(user.items.gear.owned.headAccessory_special_wolfEars).to.be.true;
});
it('unlocks a an item', () => {
let response = unlock(user, {query: {path: backgroundUnlockPath}});
let [, message] = unlock(user, {query: {path: backgroundUnlockPath}});
expect(response.message).to.equal(i18n.t('unlocked'));
expect(message).to.equal(i18n.t('unlocked'));
expect(user.purchased.background.giant_florals).to.be.true;
});
it('reduces a user\'s balance', () => {
let response = unlock(user, {query: {path: unlockPath}});
let [, message] = unlock(user, {query: {path: unlockPath}});
expect(response.message).to.equal(i18n.t('unlocked'));
expect(message).to.equal(i18n.t('unlocked'));
expect(user.balance).to.equal(usersStartingGems - unlockCost);
});
});
test/common/ops/updateTask.js
+1 -1
View File
@@ -19,7 +19,7 @@ describe('shared.ops.updateTask', () => {
}],
});
let res = updateTask(habit, {
let [res] = updateTask(habit, {
body: {
text: 'updated',
id: '123',
test/helpers/api-integration/requester.js
+8 -1
View File
@@ -92,7 +92,14 @@ function _parseRes (res) {
if (apiVersion === 'v2') {
return res.body;
} else if (apiVersion === 'v3') {
return res.body.data;
if (res.body.message) {
return {
data: res.body.data,
message: res.body.message,
};
} else {
return res.body.data;
}
}
}