Merge pull request #130 from massalabs/fix-test

Remove the `if` condition from the `ci-tests.yml` workflow file.
massalabs · Sep 6, 2023 · 91ea4da · 91ea4da
2 parents 01956ec + 47e9d38
commit 91ea4da
Show file tree

Hide file tree

Showing 60 changed files with 3,614 additions and 2,984 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -4,4 +4,4 @@ node_modules
 bundle.*
 docs
 dist
-test/simple-browser-extension
+test-extension/simple-browser-extension
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
@@ -2,10 +2,9 @@ name: CI tests
 on: [push]
 jobs:
   unit-tests:
-    if: false
     runs-on: ubuntu-latest
     container:
-      image: mcr.microsoft.com/playwright:v1.32.0-focal
+      image: mcr.microsoft.com/playwright:v1.36.2-focal
     steps:
       - uses: actions/checkout@v3
 
@@ -21,4 +20,4 @@ jobs:
         run: npm run build
 
       - name: Test using dummy extension
-        run: HOME=/root npm run test
+        run: HOME=/root npm run test-extension
diff --git a/.gitignore b/.gitignore
@@ -78,6 +78,6 @@ docs
 .env
 
 # Playwright tests results
-test/playwright-tests/playwright-report
+test-extension/playwright-tests/playwright-report
 
-test/runner.js
+test-extension/runner.js
diff --git a/.npmignore b/.npmignore
@@ -1,5 +1,5 @@
 src/
-test/
+test-extension/
 tsconfig.json
 tslint.json
 .npmrc

diff --git a/.prettierignore b/.prettierignore
@@ -9,5 +9,5 @@ dist
 *.md
 *.html
 *.css
-test/simple-browser-extension
+test-extension/simple-browser-extension
 
diff --git a/package.json b/package.json
@@ -17,8 +17,8 @@
         "update-version-major": "npm version major",
         "update-version-minor": "npm version minor",
         "update-version-patch": "npm version patch",
-        "test:serve-dapp": "cp ./bundle.js ./test/dapp/bundle.js && http-server test/dapp --cors --port 9009",
-        "test": "cd ./test && npx playwright test",
+        "test-extension:serve-dapp": "cp ./bundle.js ./test-extension/dapp/bundle.js && http-server test-extension/dapp --cors --port 9009",
+        "test-extension": "cd ./test-extension && npx playwright test",
         "lint": "eslint .",
         "lint:fix": "eslint . --fix",
         "prettier": "prettier --check .",

diff --git a/test/README.md → test-extension/README.md b/test/README.md → test-extension/README.md
diff --git a/test/dapp/index.html → test-extension/dapp/index.html b/test/dapp/index.html → test-extension/dapp/index.html
@@ -30,7 +30,7 @@
       console.log("[DAPP_HTML] Discovered providers ...", providers);
 
       // get a provider (not MASSASTATION)
-      const myProvider = providers.find((p) => p.name() !== "MASSASTATION");
+      const myProvider = providers.find((p) => p.name() === "SPACE_X");
       console.log("[DAPP_HTML] Provider Name", myProvider);
 
       // import an account

diff --git a/test/playwright-tests/install_ff_addons.ts → ...ion/playwright-tests/install_ff_addons.ts b/test/playwright-tests/install_ff_addons.ts → ...ion/playwright-tests/install_ff_addons.ts
diff --git a/...aywright-tests/lib_with_extension.spec.ts → ...aywright-tests/lib_with_extension.spec.ts b/...aywright-tests/lib_with_extension.spec.ts → ...aywright-tests/lib_with_extension.spec.ts
diff --git a/test/playwright.config.ts → test-extension/playwright.config.ts b/test/playwright.config.ts → test-extension/playwright.config.ts
@@ -36,16 +36,15 @@ export default defineConfig({
       name: 'chromium',
       use: { ...devices['Desktop Chrome'] },
     },
-
-    {
-      name: 'firefox',
-      use: { ...devices['Desktop Firefox'] },
-    },
+    // {
+    //   name: 'firefox',
+    //   use: { ...devices['Desktop Firefox'] },
+    // },
   ],
 
   /* Run your local dev server before starting the tests */
   webServer: {
-    command: 'npm run test:serve-dapp',
+    command: 'npm run test-extension:serve-dapp',
     port: 9009,
   },
 });
diff --git a/test/simple-browser-extension/.eslintignore → ...on/simple-browser-extension/.eslintignore b/test/simple-browser-extension/.eslintignore → ...on/simple-browser-extension/.eslintignore
diff --git a/test/simple-browser-extension/.eslintrc.cjs → ...on/simple-browser-extension/.eslintrc.cjs b/test/simple-browser-extension/.eslintrc.cjs → ...on/simple-browser-extension/.eslintrc.cjs
diff --git a/test/simple-browser-extension/.gitignore → ...nsion/simple-browser-extension/.gitignore b/test/simple-browser-extension/.gitignore → ...nsion/simple-browser-extension/.gitignore
diff --git a/test/simple-browser-extension/.lintstagedrc → ...on/simple-browser-extension/.lintstagedrc b/test/simple-browser-extension/.lintstagedrc → ...on/simple-browser-extension/.lintstagedrc
diff --git a/test/simple-browser-extension/.npmignore → ...nsion/simple-browser-extension/.npmignore b/test/simple-browser-extension/.npmignore → ...nsion/simple-browser-extension/.npmignore
@@ -1,5 +1,5 @@
 src/
-test/
+test-extension/
 tsconfig.json
 tslint.json
 .npmrc

diff --git a/.../simple-browser-extension/.prettierignore → .../simple-browser-extension/.prettierignore b/.../simple-browser-extension/.prettierignore → .../simple-browser-extension/.prettierignore
diff --git a/test/simple-browser-extension/LICENSE → ...xtension/simple-browser-extension/LICENSE b/test/simple-browser-extension/LICENSE → ...xtension/simple-browser-extension/LICENSE
diff --git a/test/simple-browser-extension/README.md → ...ension/simple-browser-extension/README.md b/test/simple-browser-extension/README.md → ...ension/simple-browser-extension/README.md
diff --git a/...imple-browser-extension/package-lock.json → ...imple-browser-extension/package-lock.json b/...imple-browser-extension/package-lock.json → ...imple-browser-extension/package-lock.json
diff --git a/test/simple-browser-extension/package.json → ...ion/simple-browser-extension/package.json b/test/simple-browser-extension/package.json → ...ion/simple-browser-extension/package.json
diff --git a/...simple-browser-extension/plugin/README.md → ...simple-browser-extension/plugin/README.md b/...simple-browser-extension/plugin/README.md → ...simple-browser-extension/plugin/README.md
diff --git a/...-browser-extension/plugin/background.html → ...-browser-extension/plugin/background.html b/...-browser-extension/plugin/background.html → ...-browser-extension/plugin/background.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-
+    <title>Background</title>
     <script type='text/javascript' src='lib/browserified.js'></script>
     <script type="module" src="background.js"></script>
 

diff --git a/...le-browser-extension/plugin/background.js → ...le-browser-extension/plugin/background.js b/...le-browser-extension/plugin/background.js → ...le-browser-extension/plugin/background.js
@@ -42,20 +42,20 @@ class MassaSpaceWalletImpl {
       return ['http://localhost:1234', 'https://massa-nodes.net'];
     } else if (request.action === 'buyRolls') {
       return {
-        operationId: "ABC"
-       }
+        operationId: 'ABC',
+      };
     } else if (request.action === 'sellRolls') {
       return {
-        operationId: "XYZ"
-        }
+        operationId: 'XYZ',
+      };
     } else if (request.action === 'sendTransaction') {
       return {
-        operationId: "MNP"
-        }
+        operationId: 'MNP',
+      };
     } else if (request.action === 'callSC') {
       return {
-        operationId: "RST"
-        }
+        operationId: 'RST',
+      };
     } else {
       return undefined;
     }

diff --git a/.../plugin/content_scripts/content-script.js → .../plugin/content_scripts/content-script.js b/.../plugin/content_scripts/content-script.js → .../plugin/content_scripts/content-script.js
@@ -49,7 +49,7 @@ const WALLET_PROVIDER_NAME = 'SPACE_X';
     }
     async generateNewAccount(payload) {
       return {
-        name: "new-account",
+        name: 'new-account',
         address: '0x1234',
       };
     }

diff --git a/...le-browser-extension/plugin/icons/LICENSE → ...le-browser-extension/plugin/icons/LICENSE b/...le-browser-extension/plugin/icons/LICENSE → ...le-browser-extension/plugin/icons/LICENSE
diff --git a/...xtension/plugin/icons/beasts-32-light.png → ...xtension/plugin/icons/beasts-32-light.png b/...xtension/plugin/icons/beasts-32-light.png → ...xtension/plugin/icons/beasts-32-light.png
diff --git a/...wser-extension/plugin/icons/beasts-32.png → ...wser-extension/plugin/icons/beasts-32.png b/...wser-extension/plugin/icons/beasts-32.png → ...wser-extension/plugin/icons/beasts-32.png
diff --git a/...wser-extension/plugin/icons/beasts-48.png → ...wser-extension/plugin/icons/beasts-48.png b/...wser-extension/plugin/icons/beasts-48.png → ...wser-extension/plugin/icons/beasts-48.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,5 +9,5 @@ dist @@
     *.md
     *.html
     *.css
-    test/simple-browser-extension
+    test-extension/simple-browser-extension