upgrade deps

Author: gabrielburnworth

Gemfile.lock

@@ -88,7 +88,7 @@ GEM
     bcrypt (3.1.22)
     benchmark (0.5.0)
     bigdecimal (4.1.2)
-    brakeman (8.0.4)
+    brakeman (8.0.5)
       racc
     builder (3.3.0)
     bunny (3.1.0)
@@ -142,7 +142,7 @@ GEM
       railties (>= 6.1.0)
     faker (3.8.0)
       i18n (>= 1.8.11, < 2)
-    faraday (2.14.2)
+    faraday (2.14.3)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -152,26 +152,27 @@ GEM
       net-http (~> 0.5)
     globalid (1.3.0)
       activesupport (>= 6.1)
-    google-apis-core (1.0.2)
-      addressable (~> 2.8, >= 2.8.7)
+    google-apis-core (1.2.3)
+      addressable (~> 2.9)
       faraday (~> 2.13)
       faraday-follow_redirects (~> 0.3)
       googleauth (~> 1.14)
       mini_mime (~> 1.1)
+      multi_json (~> 1.11)
       representable (~> 3.0)
-      retriable (~> 3.1)
+      retriable (>= 3.1, < 5.0)
     google-apis-iamcredentials_v1 (0.27.0)
       google-apis-core (>= 0.15.0, < 2.a)
     google-apis-storage_v1 (0.63.0)
       google-apis-core (>= 0.15.0, < 2.a)
-    google-cloud-core (1.8.0)
+    google-cloud-core (1.9.0)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
     google-cloud-env (2.3.1)
       base64 (~> 0.2)
       faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.6.0)
-    google-cloud-storage (1.60.0)
+    google-cloud-storage (1.61.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-core (>= 0.18, < 2)
@@ -181,13 +182,13 @@ GEM
       googleauth (~> 1.9)
       mini_mime (~> 1.0)
     google-logging-utils (0.2.0)
-    googleauth (1.16.2)
+    googleauth (1.17.0)
       faraday (>= 1.0, < 3.a)
       google-cloud-env (~> 2.2)
       google-logging-utils (~> 0.1)
       jwt (>= 1.4, < 4.0)
-      multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
+      pstore (~> 0.1)
       signet (>= 0.16, < 2.a)
     hashdiff (1.2.1)
     hashie (5.1.0)
@@ -200,7 +201,7 @@ GEM
       prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.19.7)
+    json (2.19.9)
     jsonapi-renderer (0.2.2)
     jwt (3.2.0)
       base64
@@ -245,7 +246,7 @@ GEM
     mutex_m (0.3.0)
     net-http (0.9.1)
       uri (>= 0.11.1)
-    net-imap (0.6.4)
+    net-imap (0.6.4.1)
       date
       net-protocol
     net-pop (0.1.2)
@@ -266,7 +267,7 @@ GEM
     parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
-    passenger (6.1.3)
+    passenger (6.1.5)
       logger (>= 1.7.0)
       rack (>= 1.6.13)
       rackup (>= 1.0.1)
@@ -283,6 +284,7 @@ GEM
       reline (>= 0.6.0)
     pry-rails (0.3.11)
       pry (>= 0.13.0)
+    pstore (0.2.1)
     psych (5.4.0)
       date
       stringio
@@ -357,7 +359,7 @@ GEM
     responders (3.2.0)
       actionpack (>= 7.0)
       railties (>= 7.0)
-    retriable (3.8.0)
+    retriable (4.2.0)
     rexml (3.4.4)
     rollbar (3.8.0)
     rspec (3.13.2)
@@ -383,7 +385,7 @@ GEM
     rspec-support (3.13.7)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.87.0)
+    rubocop (1.88.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -397,7 +399,7 @@ GEM
     rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
-    rubocop-rails (2.35.3)
+    rubocop-rails (2.35.4)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
@@ -407,19 +409,18 @@ GEM
     scenic (1.9.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    secure_headers (7.2.0)
+    secure_headers (7.3.0)
       cgi (>= 0.1)
     securerandom (0.4.1)
-    signet (0.21.0)
+    signet (0.22.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 4.0)
-      multi_json (~> 1.10)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-cobertura (3.1.0)
+    simplecov-cobertura (3.2.0)
       rexml
       simplecov (~> 0.19)
     simplecov-html (0.13.2)
@@ -449,7 +450,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    websocket-driver (0.8.0)
+    websocket-driver (0.8.1)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)

bun.lock

@@ -28,7 +28,7 @@ import {
 } from "farmbot/dist/resources/api_resources";
 import { error, warning } from "../../../toast/toast";
 import * as ui from "../../../ui";
-import { FBSelectProps } from "../../../ui";
+import { FBSelectProps, PopoverProps } from "../../../ui";
 import {
   actRenderer,
   createRenderer,
@@ -38,6 +38,7 @@ import {
 let getDeviceSpy: jest.SpyInstance;
 let initSaveSpy: jest.SpyInstance;
 let fbSelectMock: jest.SpyInstance;
+let popoverMock: jest.SpyInstance;
 
 beforeEach(() => {
   jest.clearAllMocks();
@@ -46,6 +47,9 @@ beforeEach(() => {
   initSaveSpy = jest.spyOn(crud, "initSave").mockImplementation(jest.fn());
   fbSelectMock = jest.spyOn(ui, "FBSelect")
     .mockImplementation(((_props: FBSelectProps) => <div />) as never);
+  popoverMock = jest.spyOn(ui, "Popover")
+    .mockImplementation(({ target, content }: PopoverProps) =>
+      <div>{target}{content}</div>);
   mockDevice.registerGpio = jest.fn(() => Promise.resolve());
   mockDevice.unregisterGpio = jest.fn(() => Promise.resolve());
 });
@@ -54,6 +58,7 @@ afterEach(() => {
   getDeviceSpy.mockRestore();
   initSaveSpy.mockRestore();
   fbSelectMock.mockRestore();
+  popoverMock.mockRestore();
 });
 
 const AVAILABLE_PIN = 18;

frontend/settings/pin_bindings/__tests__/pin_binding_input_group_test.tsx

@@ -773,18 +773,25 @@ describe("selection popup controls", () => {
   });
 
   it("renders header color and delete buttons for supported objects", () => {
-    [pointObject(), weedObject()].forEach(object => {
-      const p = layerProps();
-      const wrapper = createRenderer(<ObjectPopupHeaderColor
-        {...p}
-        object={object} />);
-      expect(wrapper.toJSON()).toBeTruthy();
-      unmountRenderer(wrapper);
-    });
-    expect(createRenderer(<ObjectPopupHeaderColor
-      {...layerProps()}
-      dispatch={undefined}
-      object={pointObject()} />).toJSON()).toBeNull();
+    const popoverSpy = jest.spyOn(ui, "Popover")
+      .mockImplementation(({ target, content }: ui.PopoverProps) =>
+        <div>{target}{content}</div>);
+    try {
+      [pointObject(), weedObject()].forEach(object => {
+        const p = layerProps();
+        const wrapper = createRenderer(<ObjectPopupHeaderColor
+          {...p}
+          object={object} />);
+        expect(wrapper.toJSON()).toBeTruthy();
+        unmountRenderer(wrapper);
+      });
+      expect(createRenderer(<ObjectPopupHeaderColor
+        {...layerProps()}
+        dispatch={undefined}
+        object={pointObject()} />).toJSON()).toBeNull();
+    } finally {
+      popoverSpy.mockRestore();
+    }
 
     [
       plantObject(),

frontend/three_d_garden/selection/__tests__/selection_test.tsx

@@ -1,7 +1,7 @@
 let mockSave = () => Promise.resolve();
 
 import React from "react";
-import { render } from "@testing-library/react";
+import { act, render } from "@testing-library/react";
 import { RawAddTool as AddTool, mapStateToProps } from "../add_tool";
 import { fakeState } from "../../__test_support__/fake_state";
 import { SaveBtn } from "../../ui";
@@ -49,27 +49,21 @@ describe("<AddTool />", () => {
   });
 
   it("renders watering nozzle", () => {
-    const wrapper = createWrapper();
-    const instance = getInstance(wrapper);
-    actRenderer(() => {
-      instance.setState({ toolName: "watering nozzle" });
+    const ref = React.createRef<AddTool>();
+    const { container } = render(<AddTool {...fakeProps()} ref={ref} />);
+    act(() => {
+      ref.current?.setState({ toolName: "watering nozzle" });
     });
-    const labels = wrapper.root.findAllByType("label")
-      .map(node => node.children.join("").toLowerCase());
-    expect(labels.some(label => label.includes("flow rate"))).toBeTruthy();
-    unmountRenderer(wrapper);
+    expect(container.textContent?.toLowerCase()).toContain("flow rate");
   });
 
   it("renders seeder", () => {
-    const wrapper = createWrapper();
-    const instance = getInstance(wrapper);
-    actRenderer(() => {
-      instance.setState({ toolName: "seeder" });
+    const ref = React.createRef<AddTool>();
+    const { container } = render(<AddTool {...fakeProps()} ref={ref} />);
+    act(() => {
+      ref.current?.setState({ toolName: "seeder" });
     });
-    const labels = wrapper.root.findAllByType("label")
-      .map(node => node.children.join("").toLowerCase());
-    expect(labels.some(label => label.includes("tip z offset"))).toBeTruthy();
-    unmountRenderer(wrapper);
+    expect(container.textContent?.toLowerCase()).toContain("tip z offset");
   });
 
   it("changes flow rate", () => {

frontend/tools/__tests__/add_tool_test.tsx

@@ -43,12 +43,16 @@ const createWrapper = (element: React.ReactElement) => {
   return wrapper;
 };
 let fbSelectSpy: jest.SpyInstance;
+let popoverSpy: jest.SpyInstance;
 
 beforeEach(() => {
   jest.clearAllMocks();
   jest.spyOn(deviceActions, "move").mockImplementation(jest.fn());
   fbSelectSpy = jest.spyOn(ui, "FBSelect")
     .mockImplementation(((_: ui.FBSelectProps) => <div />) as never);
+  popoverSpy = jest.spyOn(ui, "Popover")
+    .mockImplementation(({ target }: ui.PopoverProps) =>
+      <div>{target}</div>);
 });
 
 afterEach(() => {
@@ -58,6 +62,7 @@ afterEach(() => {
     wrapper && unmountRenderer(wrapper);
   }
   fbSelectSpy.mockRestore();
+  popoverSpy.mockRestore();
 });
 
 describe("<GantryMountedInput />", () => {

frontend/tools/__tests__/tool_slot_edit_components_test.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import {
-  PopoverInteractionKind, PopoverPosition, Position,
+  PopoverInteractionKind, Position,
 } from "@blueprintjs/core";
 import { t } from "../i18next_wrapper";
 import { Markdown } from "./markdown";
@@ -9,7 +9,7 @@ import { Popover } from "./popover";
 export interface HelpProps {
   text: string;
   onHover?: boolean;
-  position?: PopoverPosition;
+  position?: Position;
   customIcon?: string;
   customClass?: string;
   links?: React.ReactElement[];

frontend/ui/help.tsx

@@ -9,7 +9,6 @@ export interface InputErrorProps {
 export const InputError = (props: InputErrorProps) =>
   props.error
     ? <Popover
-      minimal={true}
       usePortal={false}
       position={Position.TOP_LEFT}
       interactionKind={PopoverInteractionKind.HOVER}

frontend/ui/input_error.tsx

@@ -1,16 +1,18 @@
 import React from "react";
 import {
-  Popover as BlueprintPopover,
+  PopoverNext as BlueprintPopover,
   PopoverProps as BasePopoverProps,
+  popoverPropsToNextProps,
 } from "@blueprintjs/core";
 
 export interface PopoverProps extends BasePopoverProps {
   target: React.ReactNode;
 }
 
 export const Popover = (props: PopoverProps) => {
+  const nextProps = popoverPropsToNextProps({ ...props, minimal: true });
   return <span className={`bp6-popover-wrapper ${props.className}`}>
-    <BlueprintPopover {...props} minimal={true}>
+    <BlueprintPopover {...nextProps}>
       {props.target}
     </BlueprintPopover>
   </span>;