From 2a9f5e166745f28f66dbfc40ee6542dc8b6d41b4 Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Fri, 20 Sep 2019 16:44:46 +0200
Subject: [PATCH] remove BETA comment and fix tests

---
 .../webhook/GET-user-webhook.test.js          | 20 +++++++++----------
 website/server/controllers/api-v3/webhook.js  |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/api/v3/integration/webhook/GET-user-webhook.test.js b/test/api/v3/integration/webhook/GET-user-webhook.test.js
index 7dc8a82c03..138aad902a 100644
--- a/test/api/v3/integration/webhook/GET-user-webhook.test.js
+++ b/test/api/v3/integration/webhook/GET-user-webhook.test.js
@@ -1,23 +1,22 @@
 import { generateUser } from '../../../../helpers/api-integration/v3';
 
 describe('GET /user/webhook', () => {
-  let user, webhooks;
+  let user;
 
   beforeEach(async () => {
     user = await generateUser();
 
-    webhooks = [];
-    webhooks.push(await user.post('/user/webhook', {
+    await user.post('/user/webhook', {
       url: 'http://some-url.com',
       label: 'Label',
       enabled: true,
       type: 'taskActivity',
       options: { created: true, scored: true },
-    }));
-    webhooks.push(await user.post('/user/webhook', {
+    });
+    await user.post('/user/webhook', {
       url: 'http://some-other-url.com',
       enabled: false,
-    }));
+    });
 
     await user.sync();
   });
@@ -25,9 +24,10 @@ describe('GET /user/webhook', () => {
   it('returns users webhooks', async () => {
     let response = await user.get('/user/webhook');
 
-    // updatedAt times don't match for some reason, so need to omit those from comparison
-    let omitUpdatedAt = a => a.map(v => _.omit(v, 'updatedAt'));
-
-    expect(omitUpdatedAt(response)).to.eql(omitUpdatedAt(webhooks));
+    expect(response).to.eql(user.webhooks.map(w => {
+      w.createdAt = w.createdAt.toISOString();
+      w.updatedAt = w.updatedAt.toISOString();
+      return w;
+    }));
   });
 });
diff --git a/website/server/controllers/api-v3/webhook.js b/website/server/controllers/api-v3/webhook.js
index 141808ff9f..1ab37bf6a3 100644
--- a/website/server/controllers/api-v3/webhook.js
+++ b/website/server/controllers/api-v3/webhook.js
@@ -96,7 +96,7 @@ api.addWebhook = {
 };
 
 /**
- * @api {get} /api/v3/user/webhook Get webhooks - BETA
+ * @api {get} /api/v3/user/webhook Get webhooks
  * @apiName UserGetWebhook
  * @apiGroup Webhook
  *
@@ -107,7 +107,7 @@ api.getWebhook = {
   middlewares: [authWithHeaders()],
   url: '/user/webhook',
   async handler (req, res) {
-    let user = res.locals.user;
+    const user = res.locals.user;
 
     res.respond(200, user.webhooks);
   },