Fix test 1E: Incompatible wallets

tests/govtool-frontend/playwright/lib/fixtures/createWallet.ts

@@ -1,6 +1,7 @@
 import {
   CardanoTestWallet,
   CardanoTestWalletConfig,
+  CardanoTestWalletJson,
 } from "@cardanoapi/cardano-test-wallet/types";
 import { ShelleyWallet } from "@helpers/crypto";
 import { Page } from "@playwright/test";
@@ -12,7 +13,7 @@ export default async function createWallet(
   const wallet = (await ShelleyWallet.generate()).json();
 
   const initScriptArgs: {
-    wallet: CardanoTestWallet;
+    wallet: CardanoTestWalletJson;
     config: CardanoTestWalletConfig;
   } = {
     wallet,
@@ -23,12 +24,12 @@ export default async function createWallet(
     window["cardanoTestWallet"] = {
       ...window["cardanoTestWallet"],
       wallet: wallet,
-    };
+    } as CardanoTestWallet;
     if (config) {
       window["cardanoTestWallet"]["config"] = {
         ...window["cardanoTestWallet"]["config"],
         ...config,
-      };
+      } as CardanoTestWallet;
     }
   }, initScriptArgs);
 }

tests/govtool-frontend/playwright/lib/fixtures/importWallet.ts

@@ -1,10 +1,10 @@
-import { CardanoTestWallet } from "@cardanoapi/cardano-test-wallet/types";
+import { CardanoTestWalletJson } from "@cardanoapi/cardano-test-wallet/types";
 import { Page } from "@playwright/test";
 import { StaticWallet } from "@types";
 
 export async function importWallet(
   page: Page,
-  wallet: StaticWallet | CardanoTestWallet
+  wallet: StaticWallet | CardanoTestWalletJson
 ) {
   await page.addInitScript((wallet) => {
     // @ts-ignore

tests/govtool-frontend/playwright/lib/fixtures/loadExtension.ts

@@ -1,12 +1,16 @@
-import { CardanoTestWalletConfig } from "@cardanoapi/cardano-test-wallet/types";
+import {
+  CardanoTestWallet,
+  CardanoTestWalletConfig,
+} from "@cardanoapi/cardano-test-wallet/types";
 import environments from "@constants/environments";
 import { Page } from "@playwright/test";
 
 import path = require("path");
 
 export default async function loadDemosExtension(
   page: Page,
-  enableStakeSigning = false
+  enableStakeSigning?: boolean,
+  supportedExtensions?: Record<string, number>[]
 ) {
   const demosBundleScriptPath = path.resolve(
     __dirname,
@@ -17,12 +21,16 @@ export default async function loadDemosExtension(
     kuberApiUrl: environments.kuber.apiUrl,
     kuberApiKey: environments.kuber.apiKey,
   };
-  await page.addInitScript((walletConfig) => {
-    window["cardanoTestWallet"] = {
-      walletName: "demos",
-      config: walletConfig,
-    };
-  }, walletConfig);
+  await page.addInitScript(
+    ({ walletConfig, supportedExtensions }) => {
+      window["cardanoTestWallet"] = {
+        walletName: "demos",
+        supportedExtensions,
+        config: walletConfig,
+      } as CardanoTestWallet;
+    },
+    { walletConfig, supportedExtensions }
+  );
 
   await page.addInitScript({ path: demosBundleScriptPath });
 }

tests/govtool-frontend/playwright/lib/fixtures/walletExtension.ts

@@ -6,15 +6,21 @@ import loadDemosExtension from "./loadExtension";
 type WalletExtensionTestOptions = {
   wallet?: StaticWallet;
   enableStakeSigning: boolean;
+  supportedExtensions: Record<string, number>[];
 };
 
 export const test = base.extend<WalletExtensionTestOptions>({
   wallet: [null, { option: true }],
 
   enableStakeSigning: [true, { option: true }],
 
-  page: async ({ page, wallet, enableStakeSigning }, use) => {
-    await loadDemosExtension(page, enableStakeSigning);
+  supportedExtensions: [[{ cip: 95 }], { option: true }],
+
+  page: async (
+    { page, wallet, enableStakeSigning, supportedExtensions },
+    use
+  ) => {
+    await loadDemosExtension(page, enableStakeSigning, supportedExtensions);
 
     if (wallet) {
       await importWallet(page, wallet);

tests/govtool-frontend/playwright/lib/helpers/page.ts

@@ -1,24 +1,32 @@
+import { CardanoTestWallet } from "@cardanoapi/cardano-test-wallet/types";
 import { importWallet } from "@fixtures/importWallet";
 import loadDemosExtension from "@fixtures/loadExtension";
 import { Browser, Page } from "@playwright/test";
 import { StaticWallet } from "@types";
 
-interface BrowserConfig {
-  storageState: string;
+interface NewPageConfig {
+  storageState?: string;
   wallet: StaticWallet;
   enableStakeSigning?: boolean;
+  supportedExtensions?: Record<string, number>[];
 }
 
 export async function createNewPageWithWallet(
   browser: Browser,
-  { storageState, wallet, enableStakeSigning }: BrowserConfig
+  newPageConfig: NewPageConfig
 ): Promise<Page> {
+  const { storageState, wallet, ...extensionConfig } = newPageConfig;
+
   const context = await browser.newContext({
-    storageState: storageState,
+    storageState,
   });
   const newPage = await context.newPage();
 
-  await loadDemosExtension(newPage, enableStakeSigning);
+  await loadDemosExtension(
+    newPage,
+    extensionConfig.enableStakeSigning,
+    extensionConfig.supportedExtensions
+  );
   await importWallet(newPage, wallet);
 
   return newPage;

tests/govtool-frontend/playwright/lib/types.ts

@@ -1,6 +1,6 @@
-import { CardanoTestWallet } from "@cardanoapi/cardano-test-wallet/types";
+import { CardanoTestWalletJson } from "@cardanoapi/cardano-test-wallet/types";
 
-export type StaticWallet = CardanoTestWallet & {
+export type StaticWallet = CardanoTestWalletJson & {
   dRepId: string;
   address: string;
 };

tests/govtool-frontend/playwright/package.json

@@ -28,7 +28,7 @@
     "generate-wallets": "ts-node ./generate_wallets.ts 11"
   },
   "dependencies": {
-    "@cardanoapi/cardano-test-wallet": "^1.2.0",
+    "@cardanoapi/cardano-test-wallet": "^2.0.0",
     "@faker-js/faker": "^8.4.1",
     "@noble/curves": "^1.3.0",
     "@noble/ed25519": "^2.0.0",

tests/govtool-frontend/playwright/tests/1-wallet-connect/walletConnect.spec.ts

@@ -3,6 +3,7 @@ import { test } from "@fixtures/walletExtension";
 import { setAllureEpic } from "@helpers/allure";
 import convertBufferToHex from "@helpers/convertBufferToHex";
 import { ShelleyWallet } from "@helpers/crypto";
+import { createNewPageWithWallet } from "@helpers/page";
 import LoginPage from "@pages/loginPage";
 import { expect } from "@playwright/test";
 
@@ -54,13 +55,16 @@ test("1D. Should reject wallet connection in mainnet", async ({ page }) => {
 });
 
 test("1E. Should hide incompatible wallets when connecting", async ({
-  page,
+  browser,
 }) => {
-  // Disabling cip95 support for wallet
-  await createWallet(page, { supportedExtensions: [] });
+  const wallet = (await ShelleyWallet.generate()).json();
+  const newPage = await createNewPageWithWallet(browser, {
+    wallet,
+    supportedExtensions: [],
+  });
 
-  await page.goto("/");
-  await page.getByTestId("connect-wallet-button").click();
+  await newPage.goto("/");
+  await newPage.getByTestId("connect-wallet-button").click();
 
-  await expect(page.getByTestId("demos-wallet-button")).not.toBeVisible();
+  await expect(newPage.getByTestId("demos-wallet-button")).not.toBeVisible();
 });