fix backend tests

Author: chrkhl

backend/.babelrc

@@ -1,15 +1,28 @@
 {
   "presets": [
-    ["env", {
-      "targets": {
-        "node": "current"
+    [
+      "@babel/preset-env",
+      {
+        "targets": {
+          "node": "current"
+        }
       }
-    }]
+    ]
   ],
   "plugins": [
-    "transform-decorators-legacy",
-    "transform-class-properties",
-    "transform-object-rest-spread"
+    [
+      "@babel/plugin-proposal-decorators",
+      {
+        "legacy": true
+      }
+    ],
+    [
+      "@babel/plugin-proposal-class-properties",
+      {
+        "loose": true
+      }
+    ],
+    "@babel/plugin-proposal-object-rest-spread"
   ],
   "sourceMaps": "both"
 }

backend/__tests__/integration/library.test.js

@@ -1,8 +1,6 @@
 import path from 'path';
 import { createTestDatabaseConnection } from '../setup';
 import { get, post } from '../request';
-// import { rmdir } from '../../src/utils/fs';
-// import { getConfiguration } from '../../src/get-configuration';
 import { createTokenFor } from '../../src/utils/auth';
 
 describe('/library', () => {
@@ -19,22 +17,22 @@ describe('/library', () => {
     await connection.close();
   });
 
-  describe('/upload', () => {
+  describe('/upload/zip', () => {
     describe('POST', () => {
       it('should process ZIP archives containing HTML files', () => {
-        return post('/library/upload')
+        return post('/library/upload/zip')
           .set('Authorization', 'Bearer ' + authToken)
           .attach('file', path.resolve(__dirname, '../dummy-project.zip'))
           .expect(200);
       });
       it('should handle dupes', () => {
-        return post('/library/upload')
+        return post('/library/upload/zip')
           .set('Authorization', 'Bearer ' + authToken)
           .attach('file', path.resolve(__dirname, '../dummy-project.zip'))
           .expect(200);
       });
       it('should return HTTP 400 if no file was attached', () => {
-        return post('/library/upload')
+        return post('/library/upload/zip')
           .set('Authorization', 'Bearer ' + authToken)
           .expect(400);
       });

backend/__tests__/integration/projects.test.js

@@ -5,7 +5,7 @@ import { createTokenFor } from '../../src/utils/auth';
 async function createAndGetTestProject(testProjectName, authToken) {
   const res = await post('/projects')
     .set('Authorization', 'Bearer ' + authToken)
-    .send({ name: testProjectName })
+    .send({ projectName: testProjectName })
     .expect(200);
   return res.body;
 }
@@ -89,9 +89,7 @@ describe('/projects', () => {
                 .expect(200)
                 .then(fetchRes => {
                   expect(fetchRes.body.length).toBeGreaterThan(0);
-                  expect(fetchRes.body.pop().name).toEqual(
-                    'Default Whiteboard'
-                  );
+                  expect(fetchRes.body.pop().name).toEqual('First Whiteboard');
                 })
           ));
       });

backend/__tests__/setup.js

@@ -1,12 +1,15 @@
 import { View } from '../src/orm/entity/view';
 import { Asset } from '../src/orm/entity/asset';
-import { InteractionElement } from '../src/orm/entity/interaction-element';
+import { Image } from '../src/orm/entity/image';
+import { ViewImageInteractionElement } from '../src/orm/entity/view-image-interaction-element';
 import { Project } from '../src/orm/entity/project';
 import { Whiteboard } from '../src/orm/entity/whiteboard';
 import { getConnectionManager } from 'typeorm';
 import { Page } from '../src/orm/entity/page';
 import { Directory } from '../src/orm/entity/directory';
 import { User } from '../src/orm/entity/user';
+import { ViewLink } from '../src/orm/entity/view-link';
+import { ViewAnnotation } from '../src/orm/entity/view-annotation';
 
 export const createTestDatabaseConnection = () => {
   const connectionManager = getConnectionManager();
@@ -16,12 +19,15 @@ export const createTestDatabaseConnection = () => {
     dropSchema: true,
     entities: [
       Asset,
+      Image,
       Directory,
-      InteractionElement,
+      ViewImageInteractionElement,
       Page,
       Project,
       User,
       View,
+      ViewLink,
+      ViewAnnotation,
       Whiteboard
     ]
   });

backend/__tests__/unit/auth-util.test.js

@@ -6,8 +6,10 @@ describe('AuthUtil', () => {
       expect(await createHash('haash')).toBeTruthy();
     });
   });
-  describe('hashMatches', async () => {
-    const hash = await createHash('haash');
-    expect(await hashMatches(hash, 'haash')).toBeTruthy();
+  describe('hashMatches', () => {
+    it('should return true for equal strings', async () => {
+      const hash = await createHash('haash');
+      expect(await hashMatches(hash, 'haash')).toBeTruthy();
+    });
   });
 });

backend/__tests__/unit/markup-util.test.js

@@ -3,7 +3,7 @@ import { readFileSync } from 'fs';
 import { resolve as resolvePath } from 'path';
 
 describe('MarkupUtil', () => {
-  describe('extractScriptAssets', async () => {
+  describe('extractScriptAssets', () => {
     it('should return all script assets defined in an HTML document', async () => {
       const markup = readFileSync(
         resolvePath(__dirname, '../dummy-page.html')
@@ -13,7 +13,7 @@ describe('MarkupUtil', () => {
       expect(scriptAssets.filter(asset => asset.isInline).length).toEqual(1);
     });
   });
-  describe('extractStyleAssets', async () => {
+  describe('extractStyleAssets', () => {
     it('should return all style assets defined in an HTML document', async () => {
       const markup = readFileSync(
         resolvePath(__dirname, '../dummy-page.html')