Merge branch 'release' into develop

2018-10-23 22:50:49 +00:00
parent 30fd530576 1c1f270f64
commit 192dc26fbe
116 changed files with 1446 additions and 1288 deletions
@@ -39,14 +39,16 @@ describe('POST /user/push-devices', () => {
      });
  });

-  it('returns an error if user already has the push device', async () => {
+  it('fails silently if user already has the push device', async () => {
    await user.post('/user/push-devices', {type, regId});
-    await expect(user.post('/user/push-devices', {type, regId}))
-      .to.eventually.be.rejected.and.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('pushDeviceAlreadyAdded'),
-      });
+    const response = await user.post('/user/push-devices', {type, regId});
+    await user.sync();
+
+    expect(response.message).to.equal(t('pushDeviceAdded'));
+    expect(response.data[0].type).to.equal(type);
+    expect(response.data[0].regId).to.equal(regId);
+    expect(user.pushDevices[0].type).to.equal(type);
+    expect(user.pushDevices[0].regId).to.equal(regId);
  });

  it('adds a push device to the user', async () => {