test(integration): fixed loading of app after export changes

travi-org · May 12, 2020 · 4976390 · 4976390
1 parent 5227c1c
commit 4976390
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 24 deletions.
diff --git a/lib/app.js b/lib/app.js
@@ -5,10 +5,11 @@ import manifest from './manifest';
 
 require('dotenv-safe').config();
 
-export default Glue.compose(manifest, {relativeTo: __dirname}).then(server => server.start(() => {
+export default Glue.compose(manifest, {relativeTo: __dirname}).then(server => server.start().then(() => {
   server.log(`Server started at http://${server.info.address}:${server.info.port}`);
   return server;
 })).catch(err => {
   console.error(err);         // eslint-disable-line no-console
   console.trace();            // eslint-disable-line no-console
+  process.exitCode = 1;
 });
diff --git a/test/integration/features/step_definitions/common-steps.js b/test/integration/features/step_definitions/common-steps.js
@@ -1,8 +1,7 @@
-import {OK, NOT_FOUND} from 'http-status-codes';
+import {NOT_FOUND, OK} from 'http-status-codes';
 import {defineSupportCode} from 'cucumber';
 import {assert} from 'chai';
 import {World} from '../support/world';
-import loadApi from '../../../../lib/app';
 
 const statuses = {
   'Not Found': NOT_FOUND,
@@ -12,8 +11,8 @@ const statuses = {
 defineSupportCode(({Before, After, When, Then, setWorldConstructor}) => {
   setWorldConstructor(World);
 
-  Before((scenario, callback) => {
-    loadApi.then(() => callback());
+  Before(async function () {
+    this.server = await require('../../../../lib/app.js').default;
   });
 
   After(function () {

diff --git a/test/integration/features/support/world.js b/test/integration/features/support/world.js
@@ -9,8 +9,6 @@ process.env.AUTH_COOKIE_ENCRYPTION_PASSWORD = any.string();
 process.env.DATABASE_URL = any.url();
 
 export function World() {
-  const loadApi = require('../../../../lib/app.js');
-
   this.makeOzRequest = (requestDetails, appDetails, callback) => {
     const method = 'POST';
     const url = `http://example.com${requestDetails.endpoint}`;
@@ -33,23 +31,20 @@ export function World() {
   };
 
   this.requestTo = (options, callback) => {
-    loadApi.then(server => {
-      this.serverResponse = null;
-      this.server = server;
-
-      const headers = {Accept: this.mime, ...options.headers};
-
-      server.inject({
-        method: options.method,
-        url: options.url,
-        payload: options.payload,
-        headers
-      }, response => {
-        this.serverResponse = response;
-
-        callback();
-      });
-    }).catch(callback);
+    this.serverResponse = null;
+
+    const headers = {Accept: this.mime, ...options.headers};
+
+    this.server.inject({
+      method: options.method,
+      url: options.url,
+      payload: options.payload,
+      headers
+    }, response => {
+      this.serverResponse = response;
+
+      callback();
+    });
   };
 
   this.getRequestTo = (uri, callback) => {