From f37861eb087963a07e0780221cbb6bd613d683c7 Mon Sep 17 00:00:00 2001
From: Rick Carlino <rick.carlino@gmail.com>
Date: Mon, 26 Aug 2019 11:13:33 -0500
Subject: [PATCH] Dep upgrades, test upgrades

---
 .../components/fbos_settings/board_type.tsx     |  2 +-
 .../map/layers/images/image_filter_menu.tsx     |  2 +-
 frontend/farm_designer/plants/create_points.tsx |  2 +-
 .../open_farm/__tests__/cached_crop_test.ts     | 17 ++++++++++++++---
 frontend/ui/fallback_img.tsx                    |  2 +-
 package.json                                    |  8 ++++----
 6 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/frontend/devices/components/fbos_settings/board_type.tsx b/frontend/devices/components/fbos_settings/board_type.tsx
index 9c69fd681..1f9c309f4 100644
--- a/frontend/devices/components/fbos_settings/board_type.tsx
+++ b/frontend/devices/components/fbos_settings/board_type.tsx
@@ -18,7 +18,7 @@ export class BoardType extends React.Component<BoardTypeProps, BoardTypeState> {
     sending: this.sending
   };
 
-  componentWillReceiveProps() {
+  UNSAFE_componentWillReceiveProps() {
     this.setState({ sending: this.sending });
   }
 
diff --git a/frontend/farm_designer/map/layers/images/image_filter_menu.tsx b/frontend/farm_designer/map/layers/images/image_filter_menu.tsx
index 7f6e6a9d7..3d77af7a1 100644
--- a/frontend/farm_designer/map/layers/images/image_filter_menu.tsx
+++ b/frontend/farm_designer/map/layers/images/image_filter_menu.tsx
@@ -45,7 +45,7 @@ export class ImageFilterMenu
     this.updateState();
   }
 
-  componentWillReceiveProps() {
+  UNSAFE_componentWillReceiveProps() {
     this.updateState();
   }
 
diff --git a/frontend/farm_designer/plants/create_points.tsx b/frontend/farm_designer/plants/create_points.tsx
index c5aa907b0..922a3c626 100644
--- a/frontend/farm_designer/plants/create_points.tsx
+++ b/frontend/farm_designer/plants/create_points.tsx
@@ -44,7 +44,7 @@ export class CreatePoints
     this.state = {};
   }
 
-  componentWillReceiveProps() {
+  UNSAFE_componentWillReceiveProps() {
     this.getPointData();
   }
 
diff --git a/frontend/open_farm/__tests__/cached_crop_test.ts b/frontend/open_farm/__tests__/cached_crop_test.ts
index 2265487d3..dc463d5bf 100644
--- a/frontend/open_farm/__tests__/cached_crop_test.ts
+++ b/frontend/open_farm/__tests__/cached_crop_test.ts
@@ -16,11 +16,22 @@ jest.unmock("../cached_crop");
 import { cachedCrop } from "../cached_crop";
 
 describe("cachedIcon()", () => {
+  it("", () => {
+
+  });
+
   it("does an HTTP request if the icon can't be found locally", (done) => {
+
     cachedCrop("lettuce")
-      .then((item) => {
-        expect(item.svg_icon).toContain("<svg>Wow</svg>");
-        done();
+      .then((item1) => {
+        expect(item1.svg_icon).toContain("<svg>Wow</svg>");
+        cachedCrop("lettuce").then((item2) => {
+          /** Ensure that cache is actually being used: */
+          expect(item2.slug).toBe(item1.slug);
+          expect(item2.svg_icon).toBe(item1.svg_icon);
+          expect(item2.spread).toBe(undefined);
+          done();
+        });
       })
       .catch((error) => {
         expect(error).toBeFalsy();
diff --git a/frontend/ui/fallback_img.tsx b/frontend/ui/fallback_img.tsx
index a4cbd5877..5429b235d 100644
--- a/frontend/ui/fallback_img.tsx
+++ b/frontend/ui/fallback_img.tsx
@@ -16,7 +16,7 @@ export class FallbackImg extends React.Component<Props, State> {
 
   state: State = { needsFallback: false };
 
-  componentWillReceiveProps(next: Props) {
+  UNSAFE_componentWillReceiveProps(next: Props) {
     // Sorry. The webcam page needs live updates. <img/> tag was acting wonky.
     (next.src !== this.props.src) && this.setState({ needsFallback: false });
   }
diff --git a/package.json b/package.json
index 795712a63..cbd4a8892 100644
--- a/package.json
+++ b/package.json
@@ -56,13 +56,13 @@
     "parcel-bundler": "1.12.3",
     "promise-timeout": "1.3.0",
     "raf": "3.4.1",
-    "react": "16.8.6",
+    "react": "16.9.0",
     "react-addons-test-utils": "15.6.2",
     "react-color": "2.17.3",
-    "react-dom": "16.8.6",
+    "react-dom": "16.9.0",
     "react-joyride": "2.1.1",
-    "react-redux": "7.1.0",
-    "react-test-renderer": "16.8.6",
+    "react-redux": "7.1.1",
+    "react-test-renderer": "16.9.0",
     "react-transition-group": "4.2.2",
     "redux": "4.0.4",
     "redux-immutable-state-invariant": "2.1.0",