Expose distPath on reload event (#96)

nathanhammond · web-flow · commit 87bdbc65a08a · 2020-05-06T11:42:56.000-04:00
diff --git a/src/fastboot-app-server.js b/src/fastboot-app-server.js
@@ -146,7 +146,7 @@ class FastBootAppServer {
   }
 
   reload() {
-    this.broadcast({ event: 'reload' });
+    this.broadcast({ event: 'reload', distPath: this.distPath });
   }
 
   forkWorkers() {
diff --git a/src/worker.js b/src/worker.js
@@ -59,7 +59,9 @@ class Worker {
   handleMessage(message) {
     switch (message.event) {
       case 'reload':
-        this.fastboot.reload();
+        this.distPath = message.distPath || this.distPath;
+        this.ui.writeLine('Reloading the application from distPath:', this.distPath);
+        this.fastboot.reload({ distPath: this.distPath });
         break;
       case 'error':
         this.error = message.error;
diff --git a/test/app-server-test.js b/test/app-server-test.js
@@ -119,6 +119,15 @@ describe("FastBootAppServer", function() {
         expect(response.body).to.contain('Welcome to Ember from MY GLOBAL!');
       });
   });
+
+  it("allows changing of distpath", function() {
+    return runServer('dist-path-change-server')
+      .then(() => request('http://localhost:3000/'))
+      .then((response) => {
+        expect(response.statusCode).to.equal(200);
+        expect(response.body).to.contain('Welcome to Ember from MY GLOBAL!');
+      });
+  });
 });
 
 function runServer(name) {
diff --git a/test/fixtures/basic-app/index.html b/test/fixtures/basic-app/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>FastbootTest</title>
+    <title>FastbootTest - basic</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
diff --git a/test/fixtures/broken-app/index.html b/test/fixtures/broken-app/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>FastbootTest</title>
+    <title>FastbootTest - broken</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
diff --git a/test/fixtures/dist-path-change-server.js b/test/fixtures/dist-path-change-server.js
@@ -0,0 +1,48 @@
+'use strict';
+
+const path = require('path');
+const FastBootAppServer = require('../../src/fastboot-app-server');
+
+const MY_GLOBAL = 'MY GLOBAL';
+
+class DownloaderNotifier {
+  constructor(options) {
+    this.distPath = options.distPath;
+    this.subscriptions = [];
+  }
+
+  subscribe(handler) {
+    this.subscriptions.push(handler);
+    return Promise.resolve();
+  }
+
+  trigger() {
+    this.distPath = path.resolve(__dirname, './global-app');
+    this.subscriptions.forEach(handler => {
+      handler();
+    });
+  }
+
+  download() {
+    return Promise.resolve(this.distPath);
+  }
+}
+
+const connector = new DownloaderNotifier({
+  distPath: path.resolve(__dirname, './basic-app')
+});
+
+var server = new FastBootAppServer({
+  notifier: connector,
+  downloader: connector,
+  sandboxGlobals: { THE_GLOBAL: MY_GLOBAL }
+});
+
+const serverPromise = server.start();
+
+// Don't run this on worker threads.
+if (serverPromise) {
+  serverPromise.then(() => {
+    connector.trigger();
+  });
+}
diff --git a/test/fixtures/global-app/index.html b/test/fixtures/global-app/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>FastbootTest</title>
+    <title>FastbootTest - global</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ class FastBootAppServer {`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`reload() {`
`149`		`- this.broadcast({ event: 'reload' });`
	`149`	`+ this.broadcast({ event: 'reload', distPath: this.distPath });`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`forkWorkers() {`