resolving conflicts

test/api/v3/integration/user/DELETE-user.test.js

@@ -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,
     });

test/api/v3/integration/user/POST-user_release_both.test.js

@@ -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);
+  });
+});

test/api/v3/integration/user/POST-user_release_mounts.test.js

@@ -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);
+  });
+});

test/api/v3/integration/user/POST-user_release_pets.test.js

@@ -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);
+  });
+});

test/api/v3/integration/user/PUT-user_update_webhook.test.js

@@ -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);
   });