WIP

agama-project · Mar 23, 2023 · 27a8a84 · 27a8a84
1 parent bea5848
commit 27a8a84
Show file tree

Hide file tree

Showing 7 changed files with 134 additions and 18 deletions.
diff --git a/web/src/client/storage.test.js b/web/src/client/storage.test.js
@@ -28,6 +28,8 @@ jest.mock("./dbus");
 
 const cockpitProxies = {};
 
+const cockpitCallbacks = {};
+
 const contexts = {
   withoutProposal: () => {
     cockpitProxies.proposal = null;
@@ -105,6 +107,7 @@ const contexts = {
 
 const mockProxy = (iface, path) => {
   switch (iface) {
+    case "org.opensuse.DInstaller.Storage1": return cockpitProxies.storage;
     case "org.opensuse.DInstaller.Storage1.Proposal": return cockpitProxies.proposal;
     case "org.opensuse.DInstaller.Storage1.Proposal.Calculator": return cockpitProxies.proposalCalculator;
     case "org.opensuse.DInstaller.Storage1.ISCSI.Initiator": return cockpitProxies.iscsiInitiator;
@@ -118,18 +121,98 @@ const mockProxies = (iface) => {
   }
 };
 
-let client;
+const mockOnObjectChanged = (path, iface, handler) => {
+  if (!cockpitCallbacks[path]) cockpitCallbacks[path] = {};
+  cockpitCallbacks[path][iface] = handler;
+};
+
+const emitSignal = (path, iface, data) => {
+  if (!cockpitCallbacks[path]) return;
+
+  const handler = cockpitCallbacks[path][iface];
+  if(!handler) return;
+
+  return handler(data);
+};
 
 beforeEach(() => {
   // @ts-ignore
   DBusClient.mockImplementation(() => {
     return {
       proxy: mockProxy,
-      proxies: mockProxies
+      proxies: mockProxies,
+      onObjectChanged: mockOnObjectChanged
+    };
+  });
+});
+
+let client;
+
+describe("#probe", () => {
+  beforeEach(() => {
+    cockpitProxies.storage = {
+      Probe: jest.fn()
     };
+
+    client = new StorageClient();
   });
 
-  client = new StorageClient();
+  it("probes the system", async () => {
+    await client.probe();
+    expect(cockpitProxies.storage.Probe).toHaveBeenCalled();
+  });
+});
+
+describe("#isDeprecated", () => {
+  describe("if the system is not deprecated", () => {
+    beforeEach(() => {
+      cockpitProxies.storage = {
+        DeprecatedSystem: false
+      };
+
+      client = new StorageClient();
+    });
+
+    it("returns false", async () => {
+      const result = await client.isDeprecated();
+      expect(result).toEqual(false)
+    });
+  });
+});
+
+describe("#onDeprecate", () => {
+  const handler = jest.fn();
+
+  beforeEach(() => {
+    client = new StorageClient();
+    client.onDeprecate(handler);
+  });
+
+  describe("if the system was not deprecated", () => {
+    beforeEach(() => {
+      emitSignal(
+        "/org/opensuse/DInstaller/Storage1",
+        "org.opensuse.DInstaller.Storage1",
+        {});
+    });
+
+    it("does not run the handler", async () => {
+      expect(handler).not.toHaveBeenCalled();
+    });
+  });
+
+  describe("if the system was deprecated", () => {
+    beforeEach(() => {
+      emitSignal(
+        "/org/opensuse/DInstaller/Storage1",
+        "org.opensuse.DInstaller.Storage1",
+        { DeprecatedSystem: true });
+    });
+
+    it("runs the handler", async () => {
+      expect(handler).not.toHaveBeenCalled();
+    });
+  });
 });
 
 describe("#proposal", () => {
@@ -170,6 +253,7 @@ describe("#proposal", () => {
     beforeEach(() => {
       contexts.withAvailableDevices();
       contexts.withProposal();
+      client = new StorageClient();
     });
 
     it("returns the available devices and the proposal result", async () => {
@@ -182,6 +266,7 @@ describe("#proposal", () => {
   describe("#getAvailableDevices", () => {
     beforeEach(() => {
       contexts.withAvailableDevices();
+      client = new StorageClient();
     });
 
     it("returns the list of available devices", async () => {
@@ -194,6 +279,7 @@ describe("#proposal", () => {
     describe("if there is no proposal yet", () => {
       beforeEach(() => {
         contexts.withoutProposal();
+        client = new StorageClient();
       });
 
       it("returns undefined", async () => {
@@ -205,6 +291,7 @@ describe("#proposal", () => {
     describe("if there is a proposal", () => {
       beforeEach(() => {
         contexts.withProposal();
+        client = new StorageClient();
       });
 
       it("returns the proposal settings and actions", async () => {
@@ -219,6 +306,8 @@ describe("#proposal", () => {
       cockpitProxies.proposalCalculator = {
         Calculate: jest.fn()
       };
+
+      client = new StorageClient();
     });
 
     it("calculates a default proposal when no settings are given", async () => {
@@ -276,6 +365,10 @@ describe("#proposal", () => {
 });
 
 describe("#iscsi", () => {
+  beforeEach(() => {
+    client = new StorageClient();
+  });
+
   describe("#getInitiatorName", () => {
     beforeEach(() => {
       cockpitProxies.iscsiInitiator = {

diff --git a/web/src/components/core/ValidationErrors.jsx b/web/src/components/core/ValidationErrors.jsx
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) [2022] SUSE LLC
+ * Copyright (c) [2022-2023] SUSE LLC
  *
  * All Rights Reserved.
  *

diff --git a/web/src/components/core/ValidationErrors.test.jsx b/web/src/components/core/ValidationErrors.test.jsx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) [2022] SUSE LLC
+ * Copyright (c) [2022-2023] SUSE LLC
  *
  * All Rights Reserved.
  *
@@ -43,7 +43,7 @@ describe("when there are multiple errors", () => {
     ];
 
     const { user } = plainRender(<ValidationErrors title="Errors" errors={errors} />);
-    const button = await screen.findByRole("link", { name: "2 errors found" });
+    const button = await screen.findByRole("button", { name: "2 errors found" });
     await user.click(button);
 
     await waitFor(() => {

diff --git a/web/src/components/overview/StorageSection.test.jsx b/web/src/components/overview/StorageSection.test.jsx
@@ -55,7 +55,9 @@ beforeEach(() => {
         }),
         onProgressChange: noop,
         getValidationErrors: jest.fn().mockResolvedValue(errors),
-        onStatusChange: onStatusChangeFn
+        onStatusChange: onStatusChangeFn,
+        isDeprecated: jest.fn().mockResolvedValue(false),
+        onDeprecate: noop
       },
     };
   });

diff --git a/web/src/components/storage/ProposalPage.test.jsx b/web/src/components/storage/ProposalPage.test.jsx
@@ -22,6 +22,7 @@
 import React from "react";
 import { screen, waitForElementToBeRemoved } from "@testing-library/react";
 import { installerRender, mockComponent } from "~/test-utils";
+import { noop } from "~/utils";
 import { createClient } from "~/client";
 import { ProposalPage } from "~/components/storage";
 
@@ -50,7 +51,9 @@ beforeEach(() => {
           getData: jest.fn().mockResolvedValue(proposal),
           calculate: jest.fn().mockResolvedValue(0)
         },
-        getValidationErrors: jest.fn().mockResolvedValue([])
+        getValidationErrors: jest.fn().mockResolvedValue([]),
+        isDeprecated: jest.fn().mockResolvedValue(false),
+        onDeprecate: noop
       }
     };
   });

diff --git a/web/src/components/storage/ProposalSummary.test.jsx b/web/src/components/storage/ProposalSummary.test.jsx
@@ -47,22 +47,40 @@ describe("ProposalSummary", () => {
   });
 
   describe("when the proposal is calculated", () => {
-    it("renders the candidate device label", () => {
-      const proposal = {
+    let proposal;
+
+    beforeEach(() => {
+      proposal = {
         result: {
           candidateDevices: ["sdb"]
         },
         availableDevices: [
-          { id: "sda", label: "/dev/sda" },
-          { id: "sdb", label: "/dev/sdb" },
+          { id: "sda", label: "/dev/sda 300 MiB" },
+          { id: "sdb", label: "/dev/sdb 5 GiB" },
         ]
       };
+    });
 
+    it("renders the candidate device label", () => {
       installerRender(
         <ProposalSummary proposal={proposal} />
       );
 
-      screen.getByText("/dev/sdb");
+      screen.getByText("/dev/sdb 5 GiB");
+    });
+
+    describe("and the candidate device is missing", () => {
+      beforeEach(() => {
+        proposal.result.candidateDevices = ["sdc"];
+      });
+
+      it("renders the candidate device name", () => {
+        installerRender(
+          <ProposalSummary proposal={proposal} />
+        );
+
+        screen.getByText("sdc");
+      });
     });
   });
 });
diff --git a/web/src/components/storage/ProposalTargetForm.test.jsx b/web/src/components/storage/ProposalTargetForm.test.jsx
@@ -22,7 +22,7 @@
 import React from "react";
 
 import { screen, within } from "@testing-library/react";
-import { installerRender } from "~/test-utils";
+import { plainRender } from "~/test-utils";
 import { ProposalTargetForm } from "~/components/storage";
 
 const proposal = {
@@ -38,7 +38,7 @@ const onSubmitFn = jest.fn();
 
 describe("ProposalTargetForm", () => {
   it("renders a selector for choosing candidate devices among available devices in given proposal", () => {
-    installerRender(
+    plainRender(
       <ProposalTargetForm proposal={proposal} />
     );
 
@@ -49,7 +49,7 @@ describe("ProposalTargetForm", () => {
 
   describe("Selector for choosing candidate devices", () => {
     it("gets its initial value from given proposal", () => {
-      installerRender(
+      plainRender(
         <ProposalTargetForm proposal={proposal} />
       );
 
@@ -58,7 +58,7 @@ describe("ProposalTargetForm", () => {
     });
 
     it("changes its value when user changes the selection", async () => {
-      const { user } = installerRender(
+      const { user } = plainRender(
         <ProposalTargetForm proposal={proposal} />
       );
 
@@ -88,7 +88,7 @@ describe("ProposalTargetForm", () => {
         );
       };
 
-      const { user } = installerRender(<FormWrapper />);
+      const { user } = plainRender(<FormWrapper />);
 
       const deviceSelector = screen.getByRole("combobox");
       const sdbOption = within(deviceSelector).getByRole("option", { name: "/dev/sdb, 650 GiB" });