Merge pull request #50 from jayden-sudo/develop

chore: added op-goerli testcase
Elytro-eth · Sep 6, 2023 · 775d929 · 775d929
2 parents a605e69 + 0f440a5
commit 775d929
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 58 deletions.
diff --git a/.env.test.example b/.env.test.example
@@ -3,9 +3,17 @@
 # global config
 PRIVATEKEY: "<you EOA privateKey>"
 
+CHAINLIST: "arbitrum-goerli,optimism-goerli,goerli"
+
 # RPC config, key = rpc-lowercase(network name in UI)
 rpc-arbitrum-goerli: "https://goerli-rollup.arbitrum.io/rpc"
 maxfee-arbitrum-goerli: 0.0001
+activatewallet-arbitrum-goerli: true
+
+rpc-optimism-goerli: "https://optimism-goerli.publicnode.com"
+maxfee-optimism-goerli: 0.001
+activatewallet-optimism-goerli: true
 
 rpc-goerli: "https://ethereum-goerli.publicnode.com"
-maxfee-goerli: 0.001
+maxfee-goerli: 0.001
+activatewallet-goerli: false
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,7 +1,9 @@
 name: ci
+
 on:
   push:
-    branches: ["feature/ui"]
+    branches: ["develop"]
+
 jobs:
   UnitTest:
     timeout-minutes: 20
@@ -11,6 +13,18 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      # base64 < .env
+      - name: Create .env file
+        run: |
+          echo "${{ secrets.ENV_BUILD }}" | base64 -d > .env
+          ls -la .env
+        
+      # base64 < .env.test
+      - name: Create .env.test file
+        run: |
+          echo "${{ secrets.ENV_TEST }}" | base64 -d > .env.test
+          ls -la .env.test
+
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
@@ -36,15 +50,7 @@ jobs:
             ${{ runner.os }}-pnpm-store-
 
       - name: Install dependencies
-        run: pnpm install --frozen-lockfile
-
-      # base64 < .env
-      - name: Create .env file
-        run: echo "${{ secrets.ENV_BUILD }}" | base64 -d > .env
-
-      # base64 < .env.test
-      - name: Create .env.test file
-        run: echo "${{ secrets.ENV_TEST }}" | base64 -d > .env.test
+        run: pnpm install
 
       - name: Install Playwright Browsers
         run: pnpm exec playwright install chromium --with-deps
@@ -55,7 +61,7 @@ jobs:
 
       - name: Run UI:Test
         run: xvfb-run npx playwright test
-        timeout-minutes: 10
+        timeout-minutes: 20
 
       - uses: actions/upload-artifact@v3
         if: always()
@@ -79,7 +85,15 @@ jobs:
           retention-days: 30
 
       - uses: actions/upload-artifact@v3
+        if: success()
         with:
          name: dist
          path: dist/
          retention-days: 30
+
+      - uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+         name: dist(failure)
+         path: dist/
+         retention-days: 1
diff --git a/playwright.config.ts b/playwright.config.ts
@@ -15,7 +15,6 @@ export default defineConfig({
   fullyParallel: true,
   /* Fail the build on CI if you accidentally left test.only in the source code. */
   forbidOnly: !!process.env.CI,
-  /* Retry on CI only */
   retries: process.env.CI ? 1 : 0,
   /* Opt out of parallel tests on CI. */
   workers: 1,

diff --git a/tests/activateWallet.ts b/tests/activateWallet.ts
@@ -26,13 +26,6 @@ export async function activate(
         debugger;
         throw new Error("popupPage is undefined");
     }
-    for (let index = 0; index < pages.length; index++) {
-        const page = pages[index];
-        if (page.url() === "about:blank") {
-            await page.close();
-            break;
-        }
-    }
 
     await popupPage.getByRole("button", { name: "I Understand" }).click();
     await popupPage.getByText("Create New Wallet").click();
@@ -66,36 +59,23 @@ export async function activate(
     await popupPage.getByPlaceholder("Enter amount").fill(threshold.toString());
     await popupPage.getByRole("button", { name: "Continue" }).click();
 
-    await popupPage.getByRole("button", { name: "Store On-chain" }).click();
+    await popupPage.getByRole("button", { name: "Store Onchain" }).click();
     await popupPage.getByRole("button", { name: "Continue" }).click();
     await popupPage.getByRole("button", { name: "Yes" }).click();
     // await popupPage.getByRole('button', { name: 'Activate Wallet' }).click();
     await popupPage.goto(`chrome-extension://${extensionId}/popup.html`);
 
     const chainNames = await UIKit.listChainNames(popupPage);
     console.log("chainNames", chainNames);
-    const supportedChainNames = ["Arbitrum Goerli", "Goerli"];
-    if (
-        chainNames.length !== supportedChainNames.length ||
-        chainNames[0] !== supportedChainNames[0] ||
-        chainNames[1] !== supportedChainNames[1]
-    ) {
-        throw new Error(`chainNames not match!`);
-    }
     let walletAddress = "";
-    {
-        // Arbitrum Goerli
-        const chainName = supportedChainNames[0];
-        await UIKit.chooseChain(popupPage, chainName);
-        walletAddress = await UIKit.activateWallet(popupPage, chainName, screenshotDir, options);
-        //await UIKit.sendToken(popupPage, "0xb9d3eF27DDBAD4D361A412dc419EBB3A7Ee586c5", "MAX");
+    for (let index = 0; index < chainNames.length; index++) {
+        const chainName = chainNames[index];
+        if (Config.activateWallet(chainName)) {
+            await UIKit.chooseChain(popupPage, chainName);
+            walletAddress = await UIKit.activateWallet(popupPage, chainName, screenshotDir, options);
+            //await UIKit.sendToken(popupPage, "0xb9d3eF27DDBAD4D361A412dc419EBB3A7Ee586c5", "MAX");
+        }
     }
-    // {
-    //     // Goerli
-    //     const chainName = supportedChainNames[1];
-    //     await UIKit.chooseChain(popupPage, chainName);
-    //     await UIKit.activateWallet(popupPage, chainName, screenshotDir);
-    // }
 
     return {
         walletAddress: [walletAddress],

diff --git a/tests/ci.spec.ts b/tests/ci.spec.ts
@@ -25,18 +25,28 @@ if (fs.existsSync(SHARING_FILE)) {
     fs.unlinkSync(SHARING_FILE);
 }
 
+{
+    const testEnvFile = path.join(__dirname, "..", ".env.test");
+    if (!fs.existsSync(testEnvFile)) {
+        throw new Error("Please create .env.test file");
+    }
+    const testEnvContent = fs.readFileSync(testEnvFile, "utf-8");
+    if (!testEnvContent.includes("PRIVATEKEY")) {
+        console.log("testEnvFile", testEnvFile);
+        console.log("testEnvContent", testEnvContent);
+        throw new Error("Please set PRIVATEKEY in .env.test file");
+    }
+}
+
 const metamaskChromeDir = path.join(archiveDir, "chrome");
 if (!fs.existsSync(metamaskChromeDir)) {
     // curl -o metamask.zip https://raw.githubusercontent.com/jayden-sudo/archive/main/metamask.zip && unzip metamask.zip -d ./metamask
     console.log("download metamask");
     execSync(
-        `curl -o ${path.join(
+        `git clone -b metamask https://github.com/jayden-sudo/archive.git ${path.join(
             archiveDir,
-            "metamask.zip",
-        )} https://raw.githubusercontent.com/jayden-sudo/archive/main/metamask.zip && unzip ${path.join(
-            archiveDir,
-            "metamask.zip",
-        )} -d ${archiveDir}`,
+            "archive",
+        )} && unzip ${path.join(archiveDir, "archive", "metamask.zip")} -d ${archiveDir}`,
     );
     console.log("download metamask done");
 }
@@ -57,6 +67,9 @@ test.describe("CI", () => {
         console.log("Activate Wallet done");
     });
     test("Recovery Wallet", async ({ context, extensionId }) => {
+        if (process.env.CI) {
+            test.skip(true);
+        }
         test.setTimeout(1000 * 60 * 5);
         console.log("Recovery Wallet start");
         const page = (await context.pages())[0];

diff --git a/tests/recoveryWallet.ts b/tests/recoveryWallet.ts
@@ -28,13 +28,6 @@ export async function recovery(
         debugger;
         throw new Error("popupPage is undefined");
     }
-    for (let index = 0; index < pages.length; index++) {
-        const page = pages[index];
-        if (page.url() === "about:blank") {
-            await page.close();
-            break;
-        }
-    }
 
     await MetaMask.init(context);
     await MetaMask.importPrivateKey(context, guardians[0]);
@@ -63,7 +56,7 @@ export async function recovery(
     await popupPage.getByPlaceholder("Confirm password").fill("111111111");
     await popupPage.getByRole("button", { name: "Continue" }).click();
     await popupPage.getByRole("button", { name: "Next" }).click();
-    await popupPage.waitForTimeout(500);
+    await popupPage.waitForTimeout(1000);
     const qr_img_bound = await popupPage
         .locator("div")
         .filter({ hasText: /^Copy to Clickboard$/ })
@@ -148,7 +141,7 @@ export async function recovery(
         await popupPage.waitForTimeout(1000 * 5);
         // Recovery in progress
         let text = await popupPage.innerText("body");
-        if (text.includes("Goerli\nRecovered")) {
+        if (text.includes("Goerli Wallet(s)\nRecovered")) {
             recoveryStatus = true;
             break;
         }
@@ -157,9 +150,11 @@ export async function recovery(
         });
         await popupPage.waitForTimeout(500);
         text = await popupPage.innerText("body");
-        if (text.includes("Goerli\nRecovered")) {
+        if (text.includes("Goerli Wallet(s)\nRecovered")) {
             recoveryStatus = true;
             break;
+        } else {
+            console.log(text);
         }
     }
     if (!recoveryStatus) {

diff --git a/tests/utils/config.ts b/tests/utils/config.ts
@@ -1,6 +1,5 @@
 import dotenv from "dotenv";
 dotenv.config({ path: ".env.test" });
-
 export class Config {
     static privateKey(): string {
         const _privateKey = process.env.PRIVATEKEY;
@@ -42,4 +41,22 @@ export class Config {
         }
         return maxFeeNumber;
     }
+
+    static getChainList(): string {
+        const envName = `CHAINLIST`;
+        const chainList = process.env[envName];
+        if (!chainList) {
+            throw new Error(`${envName} is not defined in .env.test file`);
+        }
+        return chainList;
+    }
+
+    static activateWallet(netWorkName: string): boolean {
+        const envName = `activatewallet-${Config.networkName(netWorkName)}`;
+        const activate = process.env[envName];
+        if (!activate) {
+            throw new Error(`${envName} is not defined in .env.test file`);
+        }
+        return activate === "true";
+    }
 }