Merge branch 'master' into unit-testing

Author: maddiedierker

package.json

@@ -4,7 +4,6 @@
   "description": "",
   "main": "dist/main.js",
   "jest": {
-    "testEnvironment": "node",
     "moduleFileExtensions": [
       "js",
       "jsx"
@@ -72,7 +71,7 @@
     "file-loader": "^4.2.0",
     "idempotent-babel-polyfill": "6.26.0-1",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^15.0.0",
+    "jest": "^23.6.0",
     "jquery": "1.12.1",
     "lodash": "^4.17.5",
     "mem": ">=4.0.0",

test/unit/oceans/models/train.test.js

@@ -1,3 +1,7 @@
+/**
+ *  @jest-environment node
+ */
+
 const {initFishData} = require('@ml/utils/fishData');
 import {setState, getState, resetState} from '@ml/oceans/state';
 import {ClassType, Modes} from '@ml/oceans/constants';

test/unit/utils/SimpleTrainer.test.js

@@ -1,3 +1,7 @@
+/**
+ *  @jest-environment node
+ */
+
 import SimpleTrainer from '@ml/utils/SimpleTrainer';
 import * as tf from '@tensorflow/tfjs';
 

test/unit/utils/generateOcean.test.js

@@ -1,3 +1,7 @@
+/**
+ *  @jest-environment node
+ */
+
 import {initFishData} from '@ml/utils/fishData';
 import {generateOcean, filterOcean} from '@ml/utils/generateOcean';
 import SimpleTrainer from '@ml/utils/SimpleTrainer';