fix: e2e tests

vechain · Jun 5, 2024 · 47913b4 · 47913b4
1 parent 13e7858
commit 47913b4
Show file tree

Hide file tree

Showing 21 changed files with 252 additions and 235 deletions.
diff --git a/examples/sample-angular-app/package.json b/examples/sample-angular-app/package.json
@@ -58,6 +58,6 @@
         "karma-coverage": "~2.1.0",
         "karma-jasmine": "~4.0.0",
         "karma-jasmine-html-reporter": "~1.7.0",
-        "typescript": "~4.9.5"
+        "typescript": "5.1.6"
     }
 }
diff --git a/examples/sample-angular-app/src/app/app.component.ts b/examples/sample-angular-app/src/app/app.component.ts
@@ -1,6 +1,7 @@
 // Angular modules
-import { CUSTOM_ELEMENTS_SCHEMA, Component, type OnInit } from '@angular/core';
-import { DAppKitUI, DAppKitUIOptions } from '@vechain/dapp-kit-ui';
+import { Component, CUSTOM_ELEMENTS_SCHEMA, type OnInit } from '@angular/core';
+import type { DAppKitUIOptions } from '@vechain/dapp-kit-ui';
+import { DAppKitUI } from '@vechain/dapp-kit-ui';
 
 @Component({
     selector: 'app-root',
@@ -26,7 +27,6 @@ export class AppComponent implements OnInit {
 
         const vechainDAppKitOptions: DAppKitUIOptions = {
             nodeUrl: 'https://testnet.vechain.org/',
-            genesis: 'test',
             walletConnectOptions,
             usePersistence: true,
         };

diff --git a/examples/sample-next-app/package.json b/examples/sample-next-app/package.json
@@ -25,6 +25,6 @@
         "@types/react-dom": "^18",
         "eslint": "^8",
         "eslint-config-next": "14.1.4",
-        "typescript": "5.3.3"
+        "typescript": "5.1.6"
     }
 }
diff --git a/examples/sample-next-app/src/app/layout.tsx b/examples/sample-next-app/src/app/layout.tsx
@@ -46,7 +46,6 @@ export default function RootLayout({
             </head>
             <body className={inter.className}>
                 <DAppKitProvider
-                    genesis="test"
                     logLevel="DEBUG"
                     nodeUrl="https://testnet.vechain.org/"
                     usePersistence

diff --git a/examples/sample-react-app/package.json b/examples/sample-react-app/package.json
@@ -35,7 +35,7 @@
         "eslint-plugin-react-hooks": "^4.6.0",
         "eslint-plugin-react-refresh": "^0.4.4",
         "react-test-renderer": "^18.2.0",
-        "typescript": "^5.2.2",
+        "typescript": "5.1.6",
         "vite-plugin-node-polyfills": "^0.17.0",
         "vitest": "1.5.3"
     }

diff --git a/examples/sample-react-app/vite.config.ts.timestamp-1717581106765-94da019aa2702.mjs b/examples/sample-react-app/vite.config.ts.timestamp-1717581106765-94da019aa2702.mjs
@@ -0,0 +1,40 @@
+// vite.config.ts
+import { defineConfig } from "file:///Users/darren/workspace/vechain/vechain-dapp-kit/node_modules/vite/dist/node/index.js";
+import react from "file:///Users/darren/workspace/vechain/vechain-dapp-kit/node_modules/@vitejs/plugin-react/dist/index.mjs";
+import { nodePolyfills } from "file:///Users/darren/workspace/vechain/vechain-dapp-kit/node_modules/vite-plugin-node-polyfills/dist/index.js";
+import { resolve } from "path";
+var __vite_injected_original_dirname = "/Users/darren/workspace/vechain/vechain-dapp-kit/examples/sample-react-app";
+var vite_config_default = defineConfig(({ mode }) => {
+  return {
+    plugins: [nodePolyfills(), react()],
+    build: {
+      commonjsOptions: {
+        transformMixedEsModules: true
+      }
+    },
+    preview: {
+      port: 5001,
+      strictPort: true
+    },
+    server: {
+      port: 5001,
+      strictPort: true,
+      host: true,
+      origin: "http://0.0.0.0:5001"
+    },
+    //vitest
+    test: {
+      globals: true,
+      environment: "jsdom",
+      setupFiles: [
+        resolve(__vite_injected_original_dirname, "test/setup/setup.ts"),
+        resolve(__vite_injected_original_dirname, "test/setup/resizeObserverMock.ts")
+      ]
+    },
+    base: mode === "production" ? "/vechain-dapp-kit/react/" : "/"
+  };
+});
+export {
+  vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCIvVXNlcnMvZGFycmVuL3dvcmtzcGFjZS92ZWNoYWluL3ZlY2hhaW4tZGFwcC1raXQvZXhhbXBsZXMvc2FtcGxlLXJlYWN0LWFwcFwiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiL1VzZXJzL2RhcnJlbi93b3Jrc3BhY2UvdmVjaGFpbi92ZWNoYWluLWRhcHAta2l0L2V4YW1wbGVzL3NhbXBsZS1yZWFjdC1hcHAvdml0ZS5jb25maWcudHNcIjtjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfaW1wb3J0X21ldGFfdXJsID0gXCJmaWxlOi8vL1VzZXJzL2RhcnJlbi93b3Jrc3BhY2UvdmVjaGFpbi92ZWNoYWluLWRhcHAta2l0L2V4YW1wbGVzL3NhbXBsZS1yZWFjdC1hcHAvdml0ZS5jb25maWcudHNcIjsvLy8gPHJlZmVyZW5jZSB0eXBlcz1cInZpdGVzdFwiIC8+XG5cbmltcG9ydCB7IGRlZmluZUNvbmZpZyB9IGZyb20gJ3ZpdGUnO1xuaW1wb3J0IHJlYWN0IGZyb20gJ0B2aXRlanMvcGx1Z2luLXJlYWN0JztcbmltcG9ydCB7IG5vZGVQb2x5ZmlsbHMgfSBmcm9tICd2aXRlLXBsdWdpbi1ub2RlLXBvbHlmaWxscyc7XG5pbXBvcnQgeyByZXNvbHZlIH0gZnJvbSAncGF0aCc7XG5cbmV4cG9ydCBkZWZhdWx0IGRlZmluZUNvbmZpZygoeyBtb2RlIH0pID0+IHtcbiAgICByZXR1cm4ge1xuICAgICAgICBwbHVnaW5zOiBbbm9kZVBvbHlmaWxscygpLCByZWFjdCgpXSxcbiAgICAgICAgYnVpbGQ6IHtcbiAgICAgICAgICAgIGNvbW1vbmpzT3B0aW9uczoge1xuICAgICAgICAgICAgICAgIHRyYW5zZm9ybU1peGVkRXNNb2R1bGVzOiB0cnVlLFxuICAgICAgICAgICAgfSxcbiAgICAgICAgfSxcbiAgICAgICAgcHJldmlldzoge1xuICAgICAgICAgICAgcG9ydDogNTAwMSxcbiAgICAgICAgICAgIHN0cmljdFBvcnQ6IHRydWUsXG4gICAgICAgIH0sXG4gICAgICAgIHNlcnZlcjoge1xuICAgICAgICAgICAgcG9ydDogNTAwMSxcbiAgICAgICAgICAgIHN0cmljdFBvcnQ6IHRydWUsXG4gICAgICAgICAgICBob3N0OiB0cnVlLFxuICAgICAgICAgICAgb3JpZ2luOiAnaHR0cDovLzAuMC4wLjA6NTAwMScsXG4gICAgICAgIH0sXG4gICAgICAgIC8vdml0ZXN0XG4gICAgICAgIHRlc3Q6IHtcbiAgICAgICAgICAgIGdsb2JhbHM6IHRydWUsXG4gICAgICAgICAgICBlbnZpcm9ubWVudDogJ2pzZG9tJyxcbiAgICAgICAgICAgIHNldHVwRmlsZXM6IFtcbiAgICAgICAgICAgICAgICByZXNvbHZlKF9fZGlybmFtZSwgJ3Rlc3Qvc2V0dXAvc2V0dXAudHMnKSxcbiAgICAgICAgICAgICAgICByZXNvbHZlKF9fZGlybmFtZSwgJ3Rlc3Qvc2V0dXAvcmVzaXplT2JzZXJ2ZXJNb2NrLnRzJyksXG4gICAgICAgICAgICBdLFxuICAgICAgICB9LFxuICAgICAgICBiYXNlOiBtb2RlID09PSAncHJvZHVjdGlvbicgPyAnL3ZlY2hhaW4tZGFwcC1raXQvcmVhY3QvJyA6ICcvJyxcbiAgICB9O1xufSk7XG4iXSwKICAibWFwcGluZ3MiOiAiO0FBRUEsU0FBUyxvQkFBb0I7QUFDN0IsT0FBTyxXQUFXO0FBQ2xCLFNBQVMscUJBQXFCO0FBQzlCLFNBQVMsZUFBZTtBQUx4QixJQUFNLG1DQUFtQztBQU96QyxJQUFPLHNCQUFRLGFBQWEsQ0FBQyxFQUFFLEtBQUssTUFBTTtBQUN0QyxTQUFPO0FBQUEsSUFDSCxTQUFTLENBQUMsY0FBYyxHQUFHLE1BQU0sQ0FBQztBQUFBLElBQ2xDLE9BQU87QUFBQSxNQUNILGlCQUFpQjtBQUFBLFFBQ2IseUJBQXlCO0FBQUEsTUFDN0I7QUFBQSxJQUNKO0FBQUEsSUFDQSxTQUFTO0FBQUEsTUFDTCxNQUFNO0FBQUEsTUFDTixZQUFZO0FBQUEsSUFDaEI7QUFBQSxJQUNBLFFBQVE7QUFBQSxNQUNKLE1BQU07QUFBQSxNQUNOLFlBQVk7QUFBQSxNQUNaLE1BQU07QUFBQSxNQUNOLFFBQVE7QUFBQSxJQUNaO0FBQUE7QUFBQSxJQUVBLE1BQU07QUFBQSxNQUNGLFNBQVM7QUFBQSxNQUNULGFBQWE7QUFBQSxNQUNiLFlBQVk7QUFBQSxRQUNSLFFBQVEsa0NBQVcscUJBQXFCO0FBQUEsUUFDeEMsUUFBUSxrQ0FBVyxrQ0FBa0M7QUFBQSxNQUN6RDtBQUFBLElBQ0o7QUFBQSxJQUNBLE1BQU0sU0FBUyxlQUFlLDZCQUE2QjtBQUFBLEVBQy9EO0FBQ0osQ0FBQzsiLAogICJuYW1lcyI6IFtdCn0K
diff --git a/examples/sample-remix-app/package.json b/examples/sample-remix-app/package.json
@@ -35,7 +35,7 @@
         "eslint-plugin-jsx-a11y": "^6.7.1",
         "eslint-plugin-react": "^7.33.2",
         "eslint-plugin-react-hooks": "^4.6.0",
-        "typescript": "^5.1.6",
+        "typescript": "5.1.6",
         "vite": "^5.1.0",
         "vite-plugin-node-polyfills": "^0.21.0",
         "vite-tsconfig-paths": "^4.2.1"

diff --git a/examples/sample-svelte-app/package.json b/examples/sample-svelte-app/package.json
@@ -32,7 +32,7 @@
         "svelte": "^4.0.5",
         "svelte-check": "^3.6.0",
         "tslib": "^2.4.1",
-        "typescript": "^5.0.0",
+        "typescript": "5.1.6",
         "vite": "^4.5.2",
         "vite-plugin-node-polyfills": "^0.16.0"
     }

diff --git a/examples/sample-svelte-app/src/lib/index.ts b/examples/sample-svelte-app/src/lib/index.ts
@@ -12,7 +12,6 @@ const walletConnectOptions = {
 
 const vechainDAppKitOptions = {
     nodeUrl: 'https://testnet.vechain.org/',
-    genesis: 'test',
     walletConnectOptions,
     usePersistence: true,
 };

diff --git a/examples/sample-vanilla-app/package.json b/examples/sample-vanilla-app/package.json
@@ -15,7 +15,7 @@
         "@vechain/dapp-kit-ui": "*"
     },
     "devDependencies": {
-        "typescript": "^5.2.2",
+        "typescript": "5.1.6",
         "vite": "^5.2.0"
     }
 }
diff --git a/examples/sample-vanilla-app/src/main.ts b/examples/sample-vanilla-app/src/main.ts
@@ -22,7 +22,6 @@ const walletConnectOptions = {
 
 const vechainDAppKitOptions = {
     nodeUrl: 'https://testnet.vechain.org/',
-    genesis: 'test',
     walletConnectOptions,
     usePersistence: true,
 };

diff --git a/examples/sample-vue-app/package.json b/examples/sample-vue-app/package.json
@@ -16,7 +16,7 @@
     },
     "devDependencies": {
         "@vitejs/plugin-vue": "^5.0.4",
-        "typescript": "^5.2.2",
+        "typescript": "5.1.6",
         "vite": "^5.0.12",
         "vite-plugin-node-polyfills": "^0.17.0",
         "vue-tsc": "^2.0.6"

diff --git a/examples/sample-vue-app/src/App.vue b/examples/sample-vue-app/src/App.vue
@@ -13,7 +13,6 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { DAppKitUI } from '@vechain/dapp-kit-ui';
-import { Genesis } from '@vechain/dapp-kit';
 
 const walletConnectOptions = {
     projectId: 'a0b855ceaf109dbc8426479a4c3d38d8',
@@ -27,7 +26,6 @@ const walletConnectOptions = {
 
 const vechainDAppKitOptions = {
     nodeUrl: 'https://testnet.vechain.org/',
-    genesis: 'test' as Genesis,
     walletConnectOptions,
     usePersistence: true,
 };
@@ -78,9 +76,11 @@ body {
     align-items: center;
     justify-content: center;
 }
+
 h2 {
     margin: 0;
 }
+
 .container {
     display: flex;
     flex-direction: column;
@@ -90,6 +90,7 @@ h2 {
     border-radius: 20px;
     padding: 20px;
 }
+
 .label {
     margin-top: 20px;
     margin-bottom: 10px;

diff --git a/package.json b/package.json
@@ -55,8 +55,8 @@
         "lint-staged": "^15.0.2",
         "prettier": "^2.5.1",
         "punycode": "^1.4.1",
-        "turbo": "latest",
-        "typescript": "4.9.5"
+        "turbo": "1.13.4",
+        "typescript": "5.1.6"
     },
     "packageManager": "[email protected]"
 }
diff --git a/packages/dapp-kit-ui/README.md b/packages/dapp-kit-ui/README.md
@@ -1,6 +1,9 @@
 # `@vechain/dapp-kit-ui`
 
-The Vechain DApp Kit serves as a sophisticated layer built upon @vechain/connex, providing a simplified and efficient avenue for engaging with a multitude of Vechain wallets. This innovative toolkit enhances the ease of interaction, offering developers a seamless bridge to connect with diverse Vechain wallet functionalities. For more information, please refer to the official [Vechain Docs](https://docs.vechain.org/developer-resources/sdks-and-providers/dapp-kit)
+The Vechain DApp Kit serves as a sophisticated layer built upon @vechain/connex, providing a simplified and efficient
+avenue for engaging with a multitude of Vechain wallets. This innovative toolkit enhances the ease of interaction,
+offering developers a seamless bridge to connect with diverse Vechain wallet functionalities. For more information,
+please refer to the official [Vechain Docs](https://docs.vechain.org/developer-resources/sdks-and-providers/dapp-kit)
 
 ## Usage
 
@@ -26,7 +29,6 @@ const walletConnectOptions: WalletConnectOptions = {
 
 const options: DAppKitOptions = {
     nodeUrl: 'https://testnet.vechain.org/',
-    genesis: 'test',
     walletConnectOptions,
     usePersistence: true,
 };

diff --git a/packages/dapp-kit-ui/index.js b/packages/dapp-kit-ui/index.js
@@ -14,7 +14,6 @@ const walletConnectOptions = {
 
 const vechainDAppKitOptions = {
     nodeUrl: 'https://testnet.vechain.org/',
-    genesis: 'test',
     walletConnectOptions,
     usePersistence: true,
 };

diff --git a/tests/e2e/package.json b/tests/e2e/package.json
@@ -26,6 +26,6 @@
         "selenium-webdriver": "4.8.2",
         "testcontainers": "^10.7.2",
         "ts-node": "^10.9.2",
-        "typescript": "4.9.5"
+        "typescript": "5.1.6"
     }
 }
diff --git a/tests/e2e/src/config/hooks/ContainerHooks.ts b/tests/e2e/src/config/hooks/ContainerHooks.ts
@@ -1,12 +1,12 @@
+import path from 'path';
 import { AfterAll, BeforeAll, setDefaultTimeout } from '@cucumber/cucumber';
 import {
     DockerComposeEnvironment,
     StartedDockerComposeEnvironment,
     Wait,
 } from 'testcontainers';
-import path from 'path';
-import { DappUrl } from '../../constants/dapp';
 import axios from 'axios';
+import { DappUrl } from '../../constants/dapp';
 
 setDefaultTimeout(180_000);
 
@@ -28,7 +28,7 @@ const appHealthCheck = async () => {
                 break;
             } catch (e) {
                 if (e instanceof axios.AxiosError) {
-                    console.log(app, e.message, e.code);
+                    console.log(app, e.message, e.code, url);
                 } else {
                     console.log(`Waiting for ${app} to be ready...`);
                 }

diff --git a/tests/e2e/src/extension/selenium/WebDriver.ts b/tests/e2e/src/extension/selenium/WebDriver.ts
@@ -1,22 +1,22 @@
-import * as chrome from 'selenium-webdriver/chrome';
 import util from 'util';
 import { exec as execSync } from 'child_process';
+import * as path from 'path';
+import * as console from 'console';
+import { By } from 'selenium-webdriver/lib/by';
 import wd, {
     Key,
     Session,
     until,
     WebDriver,
     WebElement,
 } from 'selenium-webdriver';
-import * as http from 'selenium-webdriver/http';
-import Locators from './Locators';
-import { By } from 'selenium-webdriver/lib/by';
-import * as path from 'path';
-import * as console from 'console';
+import * as chrome from 'selenium-webdriver/chrome';
 import { Mutex } from 'async-mutex';
-import TestDefaults from '../TestDefaults';
 import { ShadowRoot } from 'selenium-webdriver/lib/webdriver';
+import { Executor } from 'selenium-webdriver/lib/command';
 import { ROUTES } from '../enums';
+import TestDefaults from '../TestDefaults';
+import Locators from './Locators';
 
 const exec = util.promisify(execSync);
 
@@ -84,7 +84,7 @@ export const buildWebDriver = async (
         await driver.manage().setTimeouts({ implicit: TestDefaults.TIMEOUT });
 
         const session = await driver.getSession();
-        const executor = driver.getExecutor();
+        const executor: Executor = driver.getExecutor();
         const extensionDriver = new ExtensionDriver(session, executor);
 
         globalWebDriver = extensionDriver;
@@ -102,7 +102,7 @@ export const buildWebDriver = async (
 export class ExtensionDriver extends WebDriver {
     private extensionUrl: string | undefined;
 
-    constructor(session: Session | Promise<Session>, executor: http.Executor) {
+    constructor(session: Session | Promise<Session>, executor: Executor) {
         super(session, executor);
     }
 
@@ -143,7 +143,7 @@ export class ExtensionDriver extends WebDriver {
         }
         const id = await element.getId();
         throw Error(
-            'Timed out searching for shadow root on element with ID: ' + id,
+            `Timed out searching for shadow root on element with ID: ${id}`,
         );
     };
 
@@ -160,8 +160,7 @@ export class ExtensionDriver extends WebDriver {
             }
         }
         throw Error(
-            'Timed out searching for shadow root on locator: ' +
-                locator.toString(),
+            `Timed out searching for shadow root on locator: ${locator.toString()}`,
         );
     };
 
@@ -189,7 +188,7 @@ export class ExtensionDriver extends WebDriver {
             );
         } catch (e) {
             console.error(
-                'Failed to scroll into view for element ID: ' + elementId,
+                `Failed to scroll into view for element ID: ${elementId}`,
                 e,
             );
             throw e;
@@ -208,7 +207,7 @@ export class ExtensionDriver extends WebDriver {
                 await this.sleep(sleepTime);
             }
         }
-        throw Error('Could not find the shadow root element: ' + locator.value);
+        throw Error(`Could not find the shadow root element: ${locator.value}`);
     };
 
     public waitAndClick = async (locator: By) => {
@@ -243,7 +242,7 @@ export class ExtensionDriver extends WebDriver {
             await this.sleep(sleepTime);
         }
         throw Error(
-            'Timed out waiting for element to be removed: ' + locator.value,
+            `Timed out waiting for element to be removed: ${locator.value}`,
         );
     };
 
@@ -286,27 +285,6 @@ export class ExtensionDriver extends WebDriver {
         }
     };
 
-    public waitUntilElements = async (
-        locator: By,
-        timeout = TestDefaults.TIMEOUT,
-        debug = false,
-    ): Promise<WebElement[]> => {
-        try {
-            return await this.wait(
-                until.elementsLocated(locator),
-                timeout,
-                `Timed out waiting until elements located by: ${
-                    locator.value
-                } on page: ${
-                    debug ? await this.getPageSource() : 'NOT LOGGED'
-                }`,
-            );
-        } catch (e) {
-            console.log(`Timed out waiting for element ${locator.value}`);
-            throw e;
-        }
-    };
-
     public isElementPresent = async (locator: By): Promise<boolean> => {
         try {
             await extension.driver.waitUntilElement(locator);

diff --git a/tests/e2e/src/extension/utils/AddressUtils/AddressUtils.ts b/tests/e2e/src/extension/utils/AddressUtils/AddressUtils.ts
@@ -49,11 +49,9 @@ export const compareAddresses = (
     if (address2 === address1) return true;
 
     try {
-        address1 = addPrefix(address1);
-        address2 = addPrefix(address2);
         return (
-            addressUtils.toChecksummed(address1 as string) ===
-            addressUtils.toChecksummed(address2 as string)
+            addressUtils.toERC55Checksum(addPrefix(address1)) ===
+            addressUtils.toERC55Checksum(addPrefix(address2))
         );
     } catch (e) {
         return false;