Fix HMR jest reloading

Author: Ives van Hoorne

packages/app/src/app/components/Preview/DevTools/Tests/index.js

@@ -225,8 +225,17 @@ class Tests extends React.Component<Props, State> {
             immer(this.state, state => {
               const currentTest =
                 state.files[test.path].tests[testName.join('||||')];
-              currentTest.status = 'running';
-              currentTest.running = true;
+              if (!currentTest) {
+                state.files[test.path].tests[testName.join('||||')] = {
+                  status: 'running',
+                  running: true,
+                  testName,
+                  path: test.path,
+                };
+              } else {
+                currentTest.status = 'running';
+                currentTest.running = true;
+              }
             })
           );
           break;
@@ -239,10 +248,22 @@ class Tests extends React.Component<Props, State> {
             immer(this.state, state => {
               const existingTest =
                 state.files[test.path].tests[testName.join('||||')];
-              existingTest.status = test.status;
-              existingTest.running = false;
-              existingTest.errors = test.errors;
-              existingTest.duration = test.duration;
+
+              if (existingTest) {
+                existingTest.status = test.status;
+                existingTest.running = false;
+                existingTest.errors = test.errors;
+                existingTest.duration = test.duration;
+              } else {
+                state.files[test.path].tests[testName.join('||||')] = {
+                  status: test.status,
+                  running: false,
+                  errors: test.errors,
+                  duration: test.duration,
+                  testName,
+                  path: test.path,
+                };
+              }
             })
           );
           break;

packages/app/src/sandbox/eval/manager.js

@@ -107,6 +107,7 @@ export default class Manager {
     this.transpiledModulesByHash = {};
     this.configurations = {};
 
+    this.modules = modules;
     Object.keys(modules).forEach(k => this.addModule(modules[k]));
     this.testRunner = new TestRunner(this);
 
@@ -589,6 +590,8 @@ export default class Manager {
     this.transpileJobs = {};
     this.hardReload = false;
 
+    this.modules = modules;
+
     const addedModules: Array<Module> = [];
     const updatedModules: Array<Module> = [];
 

packages/app/src/sandbox/eval/tests/jest-lite.js

@@ -146,7 +146,7 @@ export default class TestRunner {
   /* istanbul ignore next */
   async transpileTests() {
     return Promise.all(
-      this.tests.map(async t => {
+      (this.tests || []).map(async t => {
         const tModule = this.manager.getTranspiledModule(t, '');
         if (
           tModule.source &&
@@ -162,7 +162,7 @@ export default class TestRunner {
         try {
           await this.manager.transpileModules(t, true);
 
-          if (!t.source) {
+          if (!tModule.source) {
             this.ranTests.delete(t.path);
           }
 
@@ -211,6 +211,10 @@ export default class TestRunner {
       this.manager.evaluateModule(testModule);
     }
 
+    if (this.manager.modules) {
+      this.findTests(this.manager.modules);
+    }
+
     // $FlowIssue
     const tests: Array<Module> = (await this.transpileTests()).filter(t => t);
 

packages/app/src/sandbox/eval/transpiled-module.js

@@ -607,7 +607,10 @@ export default class TranspiledModule {
           location.reload();
           return {};
         }
-      } else if (!this.hmrConfig || !this.hmrConfig.isDirty()) {
+      } else if (
+        !this.isTestFile &&
+        (!this.hmrConfig || !this.hmrConfig.isDirty())
+      ) {
         return this.compilation.exports;
       }
     }