mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-18 07:07:35 +01:00
resolving conflicts
This commit is contained in:
@@ -5,7 +5,12 @@ import {
|
||||
generateUser,
|
||||
translate as t,
|
||||
} from '../../../../helpers/api-integration/v3';
|
||||
import { find } from 'lodash';
|
||||
import {
|
||||
find,
|
||||
each,
|
||||
map,
|
||||
} from 'lodash';
|
||||
import Q from 'q';
|
||||
|
||||
describe('DELETE /user', () => {
|
||||
let user;
|
||||
@@ -38,6 +43,24 @@ describe('DELETE /user', () => {
|
||||
});
|
||||
|
||||
it('deletes the user', async () => {
|
||||
// gets the user's tasks ids
|
||||
let ids = [];
|
||||
each(user.tasksOrder, (idsForOrder) => {
|
||||
ids.push(...idsForOrder);
|
||||
});
|
||||
|
||||
expect(ids.length).to.be.above(0); // make sure the user has some task to delete
|
||||
|
||||
await user.del('/user', {
|
||||
password,
|
||||
});
|
||||
|
||||
await Q.all(map(ids, id => {
|
||||
return expect(checkExistence('tasks', id)).to.eventually.eql(false);
|
||||
}));
|
||||
});
|
||||
|
||||
it('delete the user\'s tasks', async () => {
|
||||
await user.del('/user', {
|
||||
password,
|
||||
});
|
||||
|
||||
48
test/api/v3/integration/user/POST-user_release_both.test.js
Normal file
48
test/api/v3/integration/user/POST-user_release_both.test.js
Normal file
@@ -0,0 +1,48 @@
|
||||
import {
|
||||
generateUser,
|
||||
translate as t,
|
||||
} from '../../../../helpers/api-integration/v3';
|
||||
|
||||
describe('POST /user/release-both', () => {
|
||||
let user;
|
||||
let animal = 'Wolf-Base';
|
||||
|
||||
beforeEach(async () => {
|
||||
user = await generateUser({
|
||||
'items.currentMount': animal,
|
||||
'items.currentPet': animal,
|
||||
'items.pets': {animal: 5},
|
||||
'items.mounts': {animal: true},
|
||||
});
|
||||
});
|
||||
|
||||
it('returns an error when user balance is too low and user does not have triadBingo', async () => {
|
||||
await expect(user.post('/user/release-both'))
|
||||
.to.eventually.be.rejected.and.to.eql({
|
||||
code: 401,
|
||||
error: 'NotAuthorized',
|
||||
message: t('notEnoughGems'),
|
||||
});
|
||||
});
|
||||
|
||||
// More tests in common code unit tests
|
||||
|
||||
it('grants triad bingo with gems', async () => {
|
||||
await user.update({
|
||||
balance: 1.5,
|
||||
});
|
||||
|
||||
let response = await user.post('/user/release-both');
|
||||
await user.sync();
|
||||
|
||||
expect(response.message).to.equal(t('mountsAndPetsReleased'));
|
||||
expect(user.balance).to.equal(0);
|
||||
expect(user.items.currentMount).to.be.empty;
|
||||
expect(user.items.currentPet).to.be.empty;
|
||||
expect(user.items.pets[animal]).to.be.empty;
|
||||
expect(user.items.mounts[animal]).to.equal(null);
|
||||
expect(user.achievements.beastMasterCount).to.equal(1);
|
||||
expect(user.achievements.mountMasterCount).to.equal(1);
|
||||
expect(user.achievements.triadBingoCount).to.equal(1);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,42 @@
|
||||
import {
|
||||
generateUser,
|
||||
translate as t,
|
||||
} from '../../../../helpers/api-integration/v3';
|
||||
|
||||
describe('POST /user/release-mounts', () => {
|
||||
let user;
|
||||
let animal = 'Wolf-Base';
|
||||
|
||||
beforeEach(async () => {
|
||||
user = await generateUser({
|
||||
'items.currentMount': animal,
|
||||
'items.mounts': {animal: true},
|
||||
});
|
||||
});
|
||||
|
||||
it('returns an error when user balance is too low', async () => {
|
||||
await expect(user.post('/user/release-mounts'))
|
||||
.to.eventually.be.rejected.and.to.eql({
|
||||
code: 401,
|
||||
error: 'NotAuthorized',
|
||||
message: t('notEnoughGems'),
|
||||
});
|
||||
});
|
||||
|
||||
// More tests in common code unit tests
|
||||
|
||||
it('releases mounts', async () => {
|
||||
await user.update({
|
||||
balance: 1,
|
||||
});
|
||||
|
||||
let response = await user.post('/user/release-mounts');
|
||||
await user.sync();
|
||||
|
||||
expect(response.message).to.equal(t('mountsReleased'));
|
||||
expect(user.balance).to.equal(0);
|
||||
expect(user.items.currentMount).to.be.empty;
|
||||
expect(user.items.mounts[animal]).to.equal(null);
|
||||
expect(user.achievements.mountMasterCount).to.equal(1);
|
||||
});
|
||||
});
|
||||
42
test/api/v3/integration/user/POST-user_release_pets.test.js
Normal file
42
test/api/v3/integration/user/POST-user_release_pets.test.js
Normal file
@@ -0,0 +1,42 @@
|
||||
import {
|
||||
generateUser,
|
||||
translate as t,
|
||||
} from '../../../../helpers/api-integration/v3';
|
||||
|
||||
describe('POST /user/release-pets', () => {
|
||||
let user;
|
||||
let animal = 'Wolf-Base';
|
||||
|
||||
beforeEach(async () => {
|
||||
user = await generateUser({
|
||||
'items.currentPet': animal,
|
||||
'items.pets': {animal: 5},
|
||||
});
|
||||
});
|
||||
|
||||
it('returns an error when user balance is too low', async () => {
|
||||
await expect(user.post('/user/release-pets'))
|
||||
.to.eventually.be.rejected.and.to.eql({
|
||||
code: 401,
|
||||
error: 'NotAuthorized',
|
||||
message: t('notEnoughGems'),
|
||||
});
|
||||
});
|
||||
|
||||
// More tests in common code unit tests
|
||||
|
||||
it('releases pets', async () => {
|
||||
await user.update({
|
||||
balance: 1,
|
||||
});
|
||||
|
||||
let response = await user.post('/user/release-pets');
|
||||
await user.sync();
|
||||
|
||||
expect(response.message).to.equal(t('petsReleased'));
|
||||
expect(user.balance).to.equal(0);
|
||||
expect(user.items.currentPet).to.be.empty;
|
||||
expect(user.items.pets[animal]).to.equal(0);
|
||||
expect(user.achievements.beastMasterCount).to.equal(1);
|
||||
});
|
||||
});
|
||||
@@ -25,7 +25,7 @@ describe('PUT /user/webhook/:id', () => {
|
||||
await user.sync();
|
||||
expect(user.preferences.webhooks[response.id].url).to.not.eql(url);
|
||||
let response2 = await user.put(`/user/webhook/${response.id}`, {url, enabled});
|
||||
expect(response2).to.eql({});
|
||||
expect(response2.url).to.eql(url);
|
||||
await user.sync();
|
||||
expect(user.preferences.webhooks[response.id].url).to.eql(url);
|
||||
});
|
||||
|
||||
98
test/common/ops/releaseBoth.js
Normal file
98
test/common/ops/releaseBoth.js
Normal file
@@ -0,0 +1,98 @@
|
||||
import releaseBoth from '../../../common/script/ops/releaseBoth';
|
||||
import i18n from '../../../common/script/i18n';
|
||||
import {
|
||||
generateUser,
|
||||
} from '../../helpers/common.helper';
|
||||
import {
|
||||
NotAuthorized,
|
||||
} from '../../../common/script/libs/errors';
|
||||
|
||||
describe('shared.ops.releaseBoth', () => {
|
||||
let user;
|
||||
let animal = 'Wolf-Base';
|
||||
|
||||
beforeEach(() => {
|
||||
user = generateUser();
|
||||
user.items.currentMount = animal;
|
||||
user.items.currentPet = animal;
|
||||
user.items.pets[animal] = 5;
|
||||
user.items.mounts[animal] = true;
|
||||
user.balance = 1.5;
|
||||
});
|
||||
|
||||
it('returns an error when user balance is too low and user does not have triadBingo', (done) => {
|
||||
user.balance = 0;
|
||||
|
||||
try {
|
||||
releaseBoth(user);
|
||||
} catch (err) {
|
||||
expect(err).to.be.an.instanceof(NotAuthorized);
|
||||
expect(err.message).to.equal(i18n.t('notEnoughGems'));
|
||||
done();
|
||||
}
|
||||
});
|
||||
|
||||
it('grants triad bingo with gems', () => {
|
||||
let response = releaseBoth(user);
|
||||
|
||||
expect(response.message).to.equal(i18n.t('mountsAndPetsReleased'));
|
||||
expect(user.achievements.triadBingoCount).to.equal(1);
|
||||
});
|
||||
|
||||
it('grants triad bingo without gems', () => {
|
||||
user.balance = 0;
|
||||
user.achievements.triadBingo = 1;
|
||||
user.achievements.triadBingoCount = 1;
|
||||
|
||||
let response = releaseBoth(user);
|
||||
|
||||
expect(response.message).to.equal(i18n.t('mountsAndPetsReleased'));
|
||||
expect(user.achievements.triadBingoCount).to.equal(2);
|
||||
});
|
||||
|
||||
it('releases pets', () => {
|
||||
let response = releaseBoth(user);
|
||||
|
||||
expect(response.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);
|
||||
|
||||
expect(response.message).to.equal(i18n.t('mountsAndPetsReleased'));
|
||||
expect(user.items.mounts[animal]).to.equal(null);
|
||||
});
|
||||
|
||||
it('removes currentPet', () => {
|
||||
releaseBoth(user);
|
||||
|
||||
expect(user.items.currentMount).to.be.empty;
|
||||
expect(user.items.currentPet).to.be.empty;
|
||||
});
|
||||
|
||||
it('removes currentMount', () => {
|
||||
releaseBoth(user);
|
||||
|
||||
expect(user.items.currentMount).to.be.empty;
|
||||
});
|
||||
|
||||
it('decreases user\'s balance', () => {
|
||||
releaseBoth(user);
|
||||
|
||||
expect(user.balance).to.equal(0);
|
||||
});
|
||||
|
||||
it('incremenets beastMasterCount', () => {
|
||||
releaseBoth(user);
|
||||
|
||||
expect(user.achievements.beastMasterCount).to.equal(1);
|
||||
});
|
||||
|
||||
it('incremenets mountMasterCount', () => {
|
||||
releaseBoth(user);
|
||||
|
||||
expect(user.achievements.mountMasterCount).to.equal(1);
|
||||
});
|
||||
});
|
||||
57
test/common/ops/releaseMounts.js
Normal file
57
test/common/ops/releaseMounts.js
Normal file
@@ -0,0 +1,57 @@
|
||||
import releaseMounts from '../../../common/script/ops/releaseMounts';
|
||||
import i18n from '../../../common/script/i18n';
|
||||
import {
|
||||
generateUser,
|
||||
} from '../../helpers/common.helper';
|
||||
import {
|
||||
NotAuthorized,
|
||||
} from '../../../common/script/libs/errors';
|
||||
|
||||
describe('shared.ops.releaseMounts', () => {
|
||||
let user;
|
||||
let animal = 'Wolf-Base';
|
||||
|
||||
beforeEach(() => {
|
||||
user = generateUser();
|
||||
user.items.currentMount = animal;
|
||||
user.items.mounts[animal] = true;
|
||||
user.balance = 1;
|
||||
});
|
||||
|
||||
it('returns an error when user balance is too low', (done) => {
|
||||
user.balance = 0;
|
||||
|
||||
try {
|
||||
releaseMounts(user);
|
||||
} catch (err) {
|
||||
expect(err).to.be.an.instanceof(NotAuthorized);
|
||||
expect(err.message).to.equal(i18n.t('notEnoughGems'));
|
||||
done();
|
||||
}
|
||||
});
|
||||
|
||||
it('releases mounts', () => {
|
||||
let response = releaseMounts(user);
|
||||
|
||||
expect(response.message).to.equal(i18n.t('mountsReleased'));
|
||||
expect(user.items.mounts[animal]).to.equal(null);
|
||||
});
|
||||
|
||||
it('removes currentMount', () => {
|
||||
releaseMounts(user);
|
||||
|
||||
expect(user.items.currentMount).to.be.empty;
|
||||
});
|
||||
|
||||
it('increases mountMasterCount achievement', () => {
|
||||
releaseMounts(user);
|
||||
|
||||
expect(user.achievements.mountMasterCount).to.equal(1);
|
||||
});
|
||||
|
||||
it('subtracts gems from balance', () => {
|
||||
releaseMounts(user);
|
||||
|
||||
expect(user.balance).to.equal(0);
|
||||
});
|
||||
});
|
||||
57
test/common/ops/releasePets.js
Normal file
57
test/common/ops/releasePets.js
Normal file
@@ -0,0 +1,57 @@
|
||||
import releasePets from '../../../common/script/ops/releasePets';
|
||||
import i18n from '../../../common/script/i18n';
|
||||
import {
|
||||
generateUser,
|
||||
} from '../../helpers/common.helper';
|
||||
import {
|
||||
NotAuthorized,
|
||||
} from '../../../common/script/libs/errors';
|
||||
|
||||
describe('shared.ops.releasePets', () => {
|
||||
let user;
|
||||
let animal = 'Wolf-Base';
|
||||
|
||||
beforeEach(() => {
|
||||
user = generateUser();
|
||||
user.items.currentPet = animal;
|
||||
user.items.pets[animal] = 5;
|
||||
user.balance = 1;
|
||||
});
|
||||
|
||||
it('returns an error when user balance is too low', (done) => {
|
||||
user.balance = 0;
|
||||
|
||||
try {
|
||||
releasePets(user);
|
||||
} catch (err) {
|
||||
expect(err).to.be.an.instanceof(NotAuthorized);
|
||||
expect(err.message).to.equal(i18n.t('notEnoughGems'));
|
||||
done();
|
||||
}
|
||||
});
|
||||
|
||||
it('releases pets', () => {
|
||||
let response = releasePets(user);
|
||||
|
||||
expect(response.message).to.equal(i18n.t('petsReleased'));
|
||||
expect(user.items.pets[animal]).to.equal(0);
|
||||
});
|
||||
|
||||
it('removes currentPet', () => {
|
||||
releasePets(user);
|
||||
|
||||
expect(user.items.currentPet).to.be.empty;
|
||||
});
|
||||
|
||||
it('decreases user\'s balance', () => {
|
||||
releasePets(user);
|
||||
|
||||
expect(user.balance).to.equal(0);
|
||||
});
|
||||
|
||||
it('incremenets beastMasterCount', () => {
|
||||
releasePets(user);
|
||||
|
||||
expect(user.achievements.beastMasterCount).to.equal(1);
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user