fix errors after version update

ChainSafe · Dec 9, 2022 · 7c5f319 · 7c5f319
1 parent cde14b8
commit 7c5f319
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 23 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -8,4 +8,4 @@ export * from "./setup";
 export { DapeteerJestConfig } from "./jest/global";
 
 // default constants
-export const RECOMMENDED_METAMASK_VERSION = "v10.22.2";
+export const RECOMMENDED_METAMASK_VERSION = "v10.23.0";
diff --git a/src/snap/install.ts b/src/snap/install.ts
@@ -91,6 +91,7 @@ export const installSnap =
     }
 
     const result = await installAction;
+    await installPage.waitForTimeout(1000);
     await installPage.close({ runBeforeUnload: true });
     if (!(snapIdOrLocation in result.snaps)) {
       throw new Error("Failed to install snap");

diff --git a/src/types.ts b/src/types.ts
@@ -100,8 +100,8 @@ export type Dappeteer = {
       opts?: {
         customSteps?: InstallStep[];
         version?: string;
-      },
-      installationSnapUrl?: string
+        installationSnapUrl?: string;
+      }
     ) => Promise<string>;
     /**
      * Accepts snap_confirm dialog

diff --git a/test/constant.ts b/test/constant.ts
@@ -1,9 +1,8 @@
 import { Provider, Server } from "ganache";
 
 import web3 from "web3";
-import { Dappeteer, DappeteerPage } from "../src";
+import { Dappeteer, DappeteerPage, DappeteerBrowser } from "../src";
 
-import { DappeteerBrowser } from "../src/browser";
 import { Contract, Snaps } from "./deploy";
 
 export type InjectableContext = Readonly<{

diff --git a/test/flask/snaps.spec.ts b/test/flask/snaps.spec.ts
@@ -12,28 +12,33 @@ describe("snaps", function () {
     metaMaskPage = this.metaMaskPage;
   });
 
-  beforeEach(function (this: TestContext) {
-    //skip those tests for non flask metamask
-    if (!this.browser.isMetaMaskFlask()) {
-      this.skip();
-    }
-  });
+  describe("Snaps Installation", () => {
+    beforeEach(function (this: TestContext) {
+      //skip those tests for non flask metamask
+      if (!this.browser.isMetaMaskFlask()) {
+        this.skip();
+      }
+    });
 
-  it("should install base snap from local server", async function (this: TestContext) {
-    await metaMask.snaps.installSnap(this.snapServers[Snaps.BASE_SNAP]);
-  });
+    it("should install base snap from local server", async function (this: TestContext) {
+      await metaMask.snaps.installSnap(this.snapServers[Snaps.BASE_SNAP]);
+    });
 
-  it("should install permissions snap local server", async function (this: TestContext) {
-    await metaMask.snaps.installSnap(this.snapServers[Snaps.PERMISSIONS_SNAP]);
-  });
+    it("should install permissions snap local server", async function (this: TestContext) {
+      await metaMask.snaps.installSnap(
+        this.snapServers[Snaps.PERMISSIONS_SNAP]
+      );
+    });
 
-  it("should install keys snap from local server", async function (this: TestContext) {
-    await metaMask.snaps.installSnap(this.snapServers[Snaps.KEYS_SNAP]);
+    it("should install keys snap from local server", async function (this: TestContext) {
+      await metaMask.snaps.installSnap(this.snapServers[Snaps.KEYS_SNAP]);
+    });
   });
 
   describe("should test snap methods", function () {
     let testPage: DappeteerPage;
     let snapId: string;
+    let permissionSnapId: string;
 
     beforeEach(function (this: TestContext) {
       //skip those tests for non flask metamask
@@ -49,6 +54,10 @@ describe("snaps", function () {
       snapId = await metaMask.snaps.installSnap(
         this.snapServers[Snaps.METHODS_SNAP]
       );
+      permissionSnapId = await metaMask.snaps.installSnap(
+        this.snapServers[Snaps.PERMISSIONS_SNAP]
+      );
+
       testPage = await metaMaskPage.browser().newPage();
       await testPage.goto(EXAMPLE_WEBSITE);
       return testPage;
@@ -78,10 +87,6 @@ describe("snaps", function () {
     });
 
     it("should return all notifications", async function (this: TestContext) {
-      const permissionSnapId = await metaMask.snaps.installSnap(
-        this.snapServers[Snaps.PERMISSIONS_SNAP]
-      );
-
       const emitter = await metaMask.snaps.getNotificationEmitter();
       const notificationPromise = emitter.waitForNotification();