fix: update code for new version of severless-api (#46)

* fix: update code for new version of severless-api

re twilio-labs/serverless-api#8

* chore(npm): upgrade @twilio-labs/serverless-api

* fix(tests): fix integration tests

Remove the reliance on stacktraces in the error integration tests

Author: dkundel

__tests__/runtime/__snapshots__/integration.test.ts.snap

@@ -1,12 +1,11 @@
 jest.unmock('twilio');
 
-import request from 'supertest';
-import { createServer } from '../../src/runtime/server';
-import { resolve, basename } from 'path';
-import cheerio from 'cheerio';
+import { Express } from 'express';
 import { readdirSync } from 'fs';
-import { Response as ExpressResponse, Express } from 'express';
+import { basename, resolve } from 'path';
+import request from 'supertest';
 import { StartCliConfig } from '../../src/runtime/cli/config';
+import { createServer } from '../../src/runtime/server';
 
 const TEST_DIR = resolve(__dirname, '../../fixtures');
 
@@ -36,9 +35,9 @@ function responseToSnapshotJson(response: InternalResponse) {
     // stack traces are different in every environment
     // let's not snapshot values that rely on it
     text = `${text.split('\n')[0]} ...`;
-    delete headers['content-length'];
-    delete headers['etag'];
   }
+  delete headers['content-length'];
+  delete headers['etag'];
 
   return {
     statusCode,
@@ -63,8 +62,12 @@ describe('Function integration tests', () => {
   for (const testFnCode of availableFunctions) {
     test(`${testFnCode.name} should match snapshot`, async () => {
       const response = await request(app).get(testFnCode.url);
-      const result = responseToSnapshotJson(response as InternalResponse);
-      expect(result).toMatchSnapshot();
+      if (response.status === 500) {
+        expect(response.text).toMatch(/Error/);
+      } else {
+        const result = responseToSnapshotJson(response as InternalResponse);
+        expect(result).toMatchSnapshot();
+      }
     });
   }
 });

__tests__/runtime/integration.test.ts

@@ -6,22 +6,30 @@ jest.doMock('@twilio-labs/serverless-api', () => {
       return Promise.resolve({
         assets: [
           {
-            name: 'example.html',
-            path: '/var/task/handlers/example.html',
+            name: '/example.html',
+            path: '/example.html',
+            access: 'public',
+            content: '',
           },
           {
-            name: 'secret.private.html',
-            path: '/var/task/handlers/secret.private.html',
+            name: '/secret.html',
+            path: '/secret.html',
+            access: 'private',
+            content: '',
           },
         ],
         functions: [
           {
-            name: 'sms/reply.js',
-            path: '/var/task/handlers/sms/reply.js',
+            name: '/sms/reply.js',
+            path: '/sms/reply.js',
+            access: 'public',
+            content: '',
           },
           {
-            name: 'token.protected.js',
-            path: '/var/task/handlers/token.protected.js',
+            name: '/token.js',
+            path: '/token.js',
+            access: 'protected',
+            content: '',
           },
         ],
       });
@@ -32,30 +40,44 @@ jest.doMock('@twilio-labs/serverless-api', () => {
   return mod;
 });
 
-import { getFunctionsAndAssets } from '../../../src/runtime/internal/runtime-paths';
-
 import { fsHelpers } from '@twilio-labs/serverless-api';
+import { getFunctionsAndAssets } from '../../../src/runtime/internal/runtime-paths';
 
 test('calls the right functions', async () => {
   const result = await getFunctionsAndAssets('/var/task/handlers');
   expect(fsHelpers.getListOfFunctionsAndAssets).toHaveBeenCalled();
-  expect(fsHelpers.getPathAndAccessFromFileInfo).toHaveBeenCalled();
 });
 
 test('returns the right functions and assets', async () => {
-  const { functions } = await getFunctionsAndAssets('/var/task/handlers');
+  const { functions, assets } = await getFunctionsAndAssets(
+    '/var/task/handlers'
+  );
   expect(functions).toEqual([
     {
-      functionPath: '/sms/reply',
+      name: '/sms/reply.js',
+      path: '/sms/reply.js',
       access: 'public',
-      name: 'sms/reply.js',
-      path: '/var/task/handlers/sms/reply.js',
+      content: '',
     },
     {
-      functionPath: '/token',
+      name: '/token.js',
+      path: '/token.js',
       access: 'protected',
-      name: 'token.protected.js',
-      path: '/var/task/handlers/token.protected.js',
+      content: '',
+    },
+  ]);
+  expect(assets).toEqual([
+    {
+      name: '/example.html',
+      path: '/example.html',
+      access: 'public',
+      content: '',
+    },
+    {
+      name: '/secret.html',
+      path: '/secret.html',
+      access: 'private',
+      content: '',
     },
   ]);
 });