Merge branch 'api-v3' into api-v3-client

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

@@ -10,7 +10,7 @@ import {
   each,
   map,
 } from 'lodash';
-import Q from 'q';
+import Bluebird from 'bluebird';
 
 describe('DELETE /user', () => {
   let user;
@@ -55,7 +55,7 @@ describe('DELETE /user', () => {
       password,
     });
 
-    await Q.all(map(ids, id => {
+    await Bluebird.all(map(ids, id => {
       return expect(checkExistence('tasks', id)).to.eventually.eql(false);
     }));
   });

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

@@ -1,3 +1,5 @@
+/* eslint-disable camelcase */
+
 import {
   generateUser,
   translate as t,
@@ -46,6 +48,15 @@ describe('POST /user/buy/:key', () => {
     await user.post(`/user/buy/${key}`);
     await user.sync();
 
-    expect(user.items.gear.owned).to.eql({ armor_warrior_1: true }); // eslint-disable-line camelcase
+    expect(user.items.gear.owned).to.eql({
+      armor_warrior_1: true,
+      eyewear_special_blackTopFrame: true,
+      eyewear_special_blueTopFrame: true,
+      eyewear_special_greenTopFrame: true,
+      eyewear_special_pinkTopFrame: true,
+      eyewear_special_redTopFrame: true,
+      eyewear_special_whiteTopFrame: true,
+      eyewear_special_yellowTopFrame: true,
+    });
   });
 });

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

@@ -1,3 +1,5 @@
+/* eslint-disable camelcase */
+
 import {
   generateUser,
   translate as t,
@@ -29,6 +31,15 @@ describe('POST /user/buy-gear/:key', () => {
     await user.post(`/user/buy-gear/${key}`);
     await user.sync();
 
-    expect(user.items.gear.owned).to.eql({ armor_warrior_1: true }); // eslint-disable-line camelcase
+    expect(user.items.gear.owned).to.eql({
+      armor_warrior_1: true,
+      eyewear_special_blackTopFrame: true,
+      eyewear_special_blueTopFrame: true,
+      eyewear_special_greenTopFrame: true,
+      eyewear_special_pinkTopFrame: true,
+      eyewear_special_redTopFrame: true,
+      eyewear_special_whiteTopFrame: true,
+      eyewear_special_yellowTopFrame: true,
+    });
   });
 });