From 9ee8d19af68dff427fdd7541613279871735eb56 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Fri, 13 Jan 2023 10:34:54 +0530 Subject: [PATCH 01/47] add `jest-runner-groups` and tag tests --- jest.config.ts | 1 + package.json | 1 + packages/abi-coder/src/abi-coder.test.ts | 3 +++ packages/abi-coder/src/coders/coders.test.ts | 3 +++ packages/abi-coder/src/interface.test.ts | 3 +++ packages/abi-coder/src/json-abi.test.ts | 3 +++ packages/abi-typegen/src/Abi.test.ts | 4 ++++ packages/address/src/address.test.ts | 3 +++ packages/contract/src/contracts/contract.test.ts | 3 +++ .../example-contract/src/example-contract.test.ts | 3 +++ packages/fuel-gauge/src/advanced-logging.test.ts | 3 +++ packages/fuel-gauge/src/auth-testing.test.ts | 3 +++ packages/fuel-gauge/src/call-test-contract.test.ts | 3 +++ packages/fuel-gauge/src/contract-factory.test.ts | 3 +++ packages/fuel-gauge/src/contract.test.ts | 3 +++ packages/fuel-gauge/src/coverage-contract.test.ts | 3 +++ packages/fuel-gauge/src/doc-examples.test.ts | 3 +++ packages/fuel-gauge/src/edge-cases.test.ts | 3 +++ .../fuel-gauge/src/generic-types-contract.test.ts | 3 +++ packages/fuel-gauge/src/predicate.test.ts | 3 +++ .../fuel-gauge/src/storage-test-contract.test.ts | 3 +++ packages/fuel-gauge/src/token-test-contract.test.ts | 3 +++ packages/fuels/src/cli.test.ts | 3 +++ packages/fuels/src/index.test.ts | 3 +++ packages/hasher/src/hasher.test.ts | 3 +++ packages/hdwallet/src/hdwallet.test.ts | 3 +++ packages/keystore/src/keystore.test.ts | 3 +++ packages/math/src/bn.test.ts | 3 +++ packages/math/src/functional.test.ts | 3 +++ packages/merkle/src/binaryMerkleTree.test.ts | 3 +++ packages/merklesum/src/sumMerkleTree.test.ts | 3 +++ packages/mnemonic/src/mnemonic.test.ts | 3 +++ packages/mnemonic/src/utils.test.ts | 3 +++ packages/providers/src/provider.test.ts | 3 +++ packages/script/src/script.test.ts | 3 +++ packages/signer/src/signer.test.ts | 3 +++ packages/sparsemerkle/src/sparseMerkleTree.test.ts | 3 +++ packages/transactions/src/coders/byte-array.test.ts | 3 +++ packages/transactions/src/coders/input.test.ts | 3 +++ packages/transactions/src/coders/output.test.ts | 3 +++ packages/transactions/src/coders/receipt.test.ts | 3 +++ .../transactions/src/coders/storage-slot.test.ts | 3 +++ .../transactions/src/coders/transaction.test.ts | 3 +++ packages/transactions/src/coders/tx-pointer.test.ts | 3 +++ packages/transactions/src/coders/utxo-id.test.ts | 3 +++ packages/transactions/src/coders/witness.test.ts | 3 +++ packages/versions/src/cli.test.ts | 3 +++ packages/versions/src/index.test.ts | 3 +++ .../versions/src/lib/colorizeUserVersion.test.ts | 3 +++ .../versions/src/lib/compareUserVersions.test.ts | 3 +++ .../versions/src/lib/getSupportedVersions.test.ts | 3 +++ packages/versions/src/lib/getUserVersions.test.ts | 3 +++ .../src/storages/memory-storage.test.ts | 3 +++ .../src/vaults/mnemonic-vault.test.ts | 3 +++ .../src/vaults/privatekey-vault.test.ts | 3 +++ packages/wallet-manager/src/wallet-manager.test.ts | 3 +++ packages/wallet/src/transfer.test.ts | 3 +++ packages/wallet/src/wallet-locked.test.ts | 3 +++ packages/wallet/src/wallet-unlocked.test.ts | 3 +++ packages/wallet/src/wallet.test.ts | 3 +++ packages/wordlists/src/wordlists.test.ts | 3 +++ pnpm-lock.yaml | 13 +++++++++++++ 62 files changed, 193 insertions(+) diff --git a/jest.config.ts b/jest.config.ts index bced7af3f4e..35d8042a968 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -8,6 +8,7 @@ const config: Config.InitialOptions = { modulePathIgnorePatterns: ['/dist/'], coveragePathIgnorePatterns: ['/dist/', '/test/', '.test.ts'], testTimeout: 15000, + runner: 'groups', }; export default config; diff --git a/package.json b/package.json index 218816d0753..71e72f971db 100644 --- a/package.json +++ b/package.json @@ -67,6 +67,7 @@ "ethers": "^5.7.2", "forc-bin": "workspace:*", "jest": "^29.3.1", + "jest-runner-groups": "^2.2.0", "markdownlint": "^0.23.1", "markdownlint-cli": "^0.27.1", "node-fetch": "^2.6.7", diff --git a/packages/abi-coder/src/abi-coder.test.ts b/packages/abi-coder/src/abi-coder.test.ts index 1c011f540a8..b22fbf328ef 100644 --- a/packages/abi-coder/src/abi-coder.test.ts +++ b/packages/abi-coder/src/abi-coder.test.ts @@ -6,6 +6,9 @@ import type { DecodedValue } from './coders/abstract-coder'; const B256 = '0xd5579c46dfcc7f18207013e65b44e4cb4e2c2298f4ac457ba8f82743f31e930b'; +/* + * @group node/unit + */ describe('AbiCoder', () => { const abiCoder = new AbiCoder(); diff --git a/packages/abi-coder/src/coders/coders.test.ts b/packages/abi-coder/src/coders/coders.test.ts index 5a9dd40285b..d21556de0f7 100644 --- a/packages/abi-coder/src/coders/coders.test.ts +++ b/packages/abi-coder/src/coders/coders.test.ts @@ -265,6 +265,9 @@ const testCases = [ ], ] as const; +/* + * @group node/unit + */ describe.each(testCases)('%s', (coderName, goodCases, badCases) => { it.each( goodCases.map(([coder, input, output]): [string, any, any, Coder] => [ diff --git a/packages/abi-coder/src/interface.test.ts b/packages/abi-coder/src/interface.test.ts index 3fd276e200f..0d9ad0e011e 100644 --- a/packages/abi-coder/src/interface.test.ts +++ b/packages/abi-coder/src/interface.test.ts @@ -4,6 +4,9 @@ import { toHex } from '@fuel-ts/math'; import FunctionFragment from './fragments/function-fragment'; import Interface from './interface'; +/* + * @group node/unit + */ describe('Interface', () => { const jsonFragment = { type: 'function', diff --git a/packages/abi-coder/src/json-abi.test.ts b/packages/abi-coder/src/json-abi.test.ts index 650d6d5e011..8d6d106a5f8 100644 --- a/packages/abi-coder/src/json-abi.test.ts +++ b/packages/abi-coder/src/json-abi.test.ts @@ -1,5 +1,8 @@ import { isReferenceType } from './json-abi'; +/* + * @group node/unit + */ describe('JSON ABI', () => { it.each(['u8', 'u16', 'u32', 'u64', 'bool'])( `should return false when it's not reference type`, diff --git a/packages/abi-typegen/src/Abi.test.ts b/packages/abi-typegen/src/Abi.test.ts index 4faedd643ee..c8603eaae06 100644 --- a/packages/abi-typegen/src/Abi.test.ts +++ b/packages/abi-typegen/src/Abi.test.ts @@ -12,6 +12,10 @@ import { VectorType } from './types/VectorType'; import * as parseFunctionsMod from './utils/parseFunctions'; import * as parseTypesMod from './utils/parseTypes'; +/* + * @group node/unit + */ + describe('Abi.ts', () => { /* Test helpers diff --git a/packages/address/src/address.test.ts b/packages/address/src/address.test.ts index 64955f7695b..8da811b48a9 100644 --- a/packages/address/src/address.test.ts +++ b/packages/address/src/address.test.ts @@ -17,6 +17,9 @@ const ADDRESS_BYTES = [ 226, 174, 6, 54, 251, 51, 211, 203, 42, 158, 74, ]; +/* + * @group common/unit + */ describe('Address utils', () => { test('fromBech32 (bech32 to decoded bech32)', async () => { const result = utils.fromBech32(ADDRESS_BECH32); diff --git a/packages/contract/src/contracts/contract.test.ts b/packages/contract/src/contracts/contract.test.ts index a8912f75974..4d5d71754a4 100644 --- a/packages/contract/src/contracts/contract.test.ts +++ b/packages/contract/src/contracts/contract.test.ts @@ -28,6 +28,9 @@ const ABI = { loggedTypes: [], }; +/* + * @group common/e2e + */ describe('Contract', () => { test('Create contract instance with provider', async () => { const provider = new Provider('http://localhost:4000/graphql'); diff --git a/packages/example-contract/src/example-contract.test.ts b/packages/example-contract/src/example-contract.test.ts index 09af8d989db..0f6a94b19b5 100644 --- a/packages/example-contract/src/example-contract.test.ts +++ b/packages/example-contract/src/example-contract.test.ts @@ -6,6 +6,9 @@ import path from 'path'; import { ExampleContractAbi__factory } from './example-contract-types'; +/* + * @group node/e2e + */ describe('ExampleContract', () => { it('should return the input', async () => { const provider = new Provider('http://127.0.0.1:4000/graphql'); diff --git a/packages/fuel-gauge/src/advanced-logging.test.ts b/packages/fuel-gauge/src/advanced-logging.test.ts index f988605bdb6..8147b1bebf1 100644 --- a/packages/fuel-gauge/src/advanced-logging.test.ts +++ b/packages/fuel-gauge/src/advanced-logging.test.ts @@ -14,6 +14,9 @@ beforeAll(async () => { otherContractInstance = await setupOtherContract({ cache: false }); }); +/* + * @group node/e2e + */ describe('Advanced Logging', () => { it('can get log data', async () => { const { value, logs } = await contractInstance.functions.test_function().call(); diff --git a/packages/fuel-gauge/src/auth-testing.test.ts b/packages/fuel-gauge/src/auth-testing.test.ts index 755750621db..db2cf4cfec9 100644 --- a/packages/fuel-gauge/src/auth-testing.test.ts +++ b/packages/fuel-gauge/src/auth-testing.test.ts @@ -9,6 +9,9 @@ import FactoryAbi from '../test-projects/auth_testing_contract/out/debug/auth_te let contractInstance: Contract; let wallet: WalletUnlocked; +/* + * @group node/e2e + */ describe('Auth Testing', () => { beforeAll(async () => { const provider = new Provider('http://127.0.0.1:4000/graphql'); diff --git a/packages/fuel-gauge/src/call-test-contract.test.ts b/packages/fuel-gauge/src/call-test-contract.test.ts index bde8a52ccfa..b39b1b80079 100644 --- a/packages/fuel-gauge/src/call-test-contract.test.ts +++ b/packages/fuel-gauge/src/call-test-contract.test.ts @@ -18,6 +18,9 @@ const setupContract = createSetupConfig({ const U64_MAX = bn(2).pow(64).sub(1); +/* + * @group node/e2e + */ describe('CallTestContract', () => { it.each([0, 1337, U64_MAX.sub(1)])('can call a contract with u64 (%p)', async (num) => { const contract = await setupContract(); diff --git a/packages/fuel-gauge/src/contract-factory.test.ts b/packages/fuel-gauge/src/contract-factory.test.ts index 3c58aed85b0..1d26c449c04 100644 --- a/packages/fuel-gauge/src/contract-factory.test.ts +++ b/packages/fuel-gauge/src/contract-factory.test.ts @@ -5,6 +5,9 @@ import { join } from 'path'; import storageSlots from '../test-projects/storage-test-contract/out/debug/storage-test-storage_slots.json'; +/* + * @group node/e2e + */ describe('Contract Factory', () => { const createContractFactory = async () => { // #region typedoc:contract-setup diff --git a/packages/fuel-gauge/src/contract.test.ts b/packages/fuel-gauge/src/contract.test.ts index 041ec8e9413..65a335344ae 100644 --- a/packages/fuel-gauge/src/contract.test.ts +++ b/packages/fuel-gauge/src/contract.test.ts @@ -63,6 +63,9 @@ const complexFragment = { const AltToken = '0x0101010101010101010101010101010101010101010101010101010101010101'; +/* + * @group node/e2e + */ describe('Contract', () => { it('generates function methods on a simple contract', async () => { const provider = new Provider('http://127.0.0.1:4000/graphql'); diff --git a/packages/fuel-gauge/src/coverage-contract.test.ts b/packages/fuel-gauge/src/coverage-contract.test.ts index f0cd17c7e0b..c78745ef2fe 100644 --- a/packages/fuel-gauge/src/coverage-contract.test.ts +++ b/packages/fuel-gauge/src/coverage-contract.test.ts @@ -26,6 +26,9 @@ beforeAll(async () => { contractInstance = await setupContract(); }); +/* + * @group node/e2e + */ describe('Coverage Contract', () => { it('can return outputs', async () => { // Call contract methods diff --git a/packages/fuel-gauge/src/doc-examples.test.ts b/packages/fuel-gauge/src/doc-examples.test.ts index 2f1143961d1..f91d574889a 100644 --- a/packages/fuel-gauge/src/doc-examples.test.ts +++ b/packages/fuel-gauge/src/doc-examples.test.ts @@ -38,6 +38,9 @@ const ADDRESS_BYTES = new Uint8Array([ 89, 94, 110, 63, 189, 57, 42, 79, 62, 110, ]); +/* + * @group node/e2e + */ test('it has an Address class using bech32Address', () => { // #region typedoc:Address-bech32 // #context import { Address } from 'fuels'; diff --git a/packages/fuel-gauge/src/edge-cases.test.ts b/packages/fuel-gauge/src/edge-cases.test.ts index 635e1f80ac8..87173c8dc1b 100644 --- a/packages/fuel-gauge/src/edge-cases.test.ts +++ b/packages/fuel-gauge/src/edge-cases.test.ts @@ -1,5 +1,8 @@ import { getSetupContract } from './utils'; +/* + * @group node/e2e + */ describe('Edge Cases', () => { it('can run collision_in_fn_names', async () => { const contract = await getSetupContract('collision_in_fn_names')(); diff --git a/packages/fuel-gauge/src/generic-types-contract.test.ts b/packages/fuel-gauge/src/generic-types-contract.test.ts index 9cc1705d04f..dc3584e9b17 100644 --- a/packages/fuel-gauge/src/generic-types-contract.test.ts +++ b/packages/fuel-gauge/src/generic-types-contract.test.ts @@ -10,6 +10,9 @@ const contractBytecode = readFileSync( join(__dirname, '../test-projects/generic-types-contract/out/debug/generic-types-contract.bin') ); +/* + * @group node/e2e + */ describe('GenericTypesContract', () => { it('should call complex contract function with generic type', async () => { const contract = await setup({ diff --git a/packages/fuel-gauge/src/predicate.test.ts b/packages/fuel-gauge/src/predicate.test.ts index 0da769f9011..d2deb2a489f 100644 --- a/packages/fuel-gauge/src/predicate.test.ts +++ b/packages/fuel-gauge/src/predicate.test.ts @@ -92,6 +92,9 @@ const StructAbiInputs = [ }, ]; +/* + * @group node/e2e + */ describe('Predicate', () => { it('can call a no-arg Predicate that returns true', async () => { const receiverAddress = Address.fromRandom(); diff --git a/packages/fuel-gauge/src/storage-test-contract.test.ts b/packages/fuel-gauge/src/storage-test-contract.test.ts index 4642c39db50..682fb91fcdd 100644 --- a/packages/fuel-gauge/src/storage-test-contract.test.ts +++ b/packages/fuel-gauge/src/storage-test-contract.test.ts @@ -23,6 +23,9 @@ const setup = async () => { return contract; }; +/* + * @group node/e2e + */ describe('StorageTestContract', () => { it('can increment counter', async () => { const contract = await setup(); diff --git a/packages/fuel-gauge/src/token-test-contract.test.ts b/packages/fuel-gauge/src/token-test-contract.test.ts index 48e42aee63f..23b838c9ac3 100644 --- a/packages/fuel-gauge/src/token-test-contract.test.ts +++ b/packages/fuel-gauge/src/token-test-contract.test.ts @@ -22,6 +22,9 @@ const setup = async () => { return contract; }; +/* + * @group node/e2e + */ describe('TokenTestContract', () => { it('Can mint and transfer coins', async () => { // New wallet to transfer coins and check balance diff --git a/packages/fuels/src/cli.test.ts b/packages/fuels/src/cli.test.ts index 7c516838311..4b01c6cdf25 100644 --- a/packages/fuels/src/cli.test.ts +++ b/packages/fuels/src/cli.test.ts @@ -3,6 +3,9 @@ import { Command } from 'commander'; import { run } from './cli'; +/* + * @group node/unit + */ describe('cli.js', () => { test('should call `versions` sub-program', async () => { // mocking diff --git a/packages/fuels/src/index.test.ts b/packages/fuels/src/index.test.ts index 20746d4371a..3f316fa0c24 100644 --- a/packages/fuels/src/index.test.ts +++ b/packages/fuels/src/index.test.ts @@ -1,5 +1,8 @@ import * as fuels from './index'; +/* + * @group common/unit + */ describe('index.js', () => { test('should export everything', async () => { expect(fuels.AbiCoder).toBeTruthy(); diff --git a/packages/hasher/src/hasher.test.ts b/packages/hasher/src/hasher.test.ts index 0387a6832c6..2fb98d487c7 100644 --- a/packages/hasher/src/hasher.test.ts +++ b/packages/hasher/src/hasher.test.ts @@ -3,6 +3,9 @@ import signTransactionTest from '@fuel-ts/testcases/src/signTransaction.json'; import { hashMessage, hash, hashTransaction } from './hasher'; +/* + * @group common/unit + */ describe('Hasher', () => { it('Hash message', async () => { expect(hashMessage(signMessageTest.message)).toEqual(signMessageTest.hashedMessage); diff --git a/packages/hdwallet/src/hdwallet.test.ts b/packages/hdwallet/src/hdwallet.test.ts index eaba02c8919..68d333cb078 100644 --- a/packages/hdwallet/src/hdwallet.test.ts +++ b/packages/hdwallet/src/hdwallet.test.ts @@ -1,6 +1,9 @@ import HDWallet from './hdwallet'; import HDWalletSpec from './hdwallet-spec'; +/* + * @group common/unit + */ describe('HDWallet', () => { test("Should throw error on invalid extended key's", () => { expect(() => diff --git a/packages/keystore/src/keystore.test.ts b/packages/keystore/src/keystore.test.ts index fb51151405d..0a9b67763e5 100644 --- a/packages/keystore/src/keystore.test.ts +++ b/packages/keystore/src/keystore.test.ts @@ -1,5 +1,8 @@ import * as keystore from './keystore'; +/* + * @group common/unit + */ describe('Keystore', () => { test('Encrypt and Decrypt', async () => { const password = '0b540281-f87b-49ca-be37-2264c7f260f7'; diff --git a/packages/math/src/bn.test.ts b/packages/math/src/bn.test.ts index 5255d0e0980..dc936b47f67 100644 --- a/packages/math/src/bn.test.ts +++ b/packages/math/src/bn.test.ts @@ -2,6 +2,9 @@ import type { BN } from './bn'; import { bn } from './bn'; import type { BigNumberish } from './types'; +/* + * @group common/unit + */ describe('Math - BN', () => { it('can execute operations without losing our BN reference', async () => { let test: BN; diff --git a/packages/math/src/functional.test.ts b/packages/math/src/functional.test.ts index 086ebb84770..0059567744d 100644 --- a/packages/math/src/functional.test.ts +++ b/packages/math/src/functional.test.ts @@ -6,6 +6,9 @@ import { format, formatUnits, toBytes, toHex, toNumber } from './functional'; +/* + * @group common/unit + */ describe('Math - Functional shortcuts', () => { it('should toNumber return a number', () => { expect(toNumber('50000')).toEqual(50000); diff --git a/packages/merkle/src/binaryMerkleTree.test.ts b/packages/merkle/src/binaryMerkleTree.test.ts index afefdf2e4f9..2c62f1694f0 100644 --- a/packages/merkle/src/binaryMerkleTree.test.ts +++ b/packages/merkle/src/binaryMerkleTree.test.ts @@ -3,6 +3,9 @@ import { toHex } from '@fuel-ts/math'; import { calcRoot, constructTree, getProof } from './binaryMerkleTree'; import type Node from './types/node'; +/* + * @group common/unit + */ describe('Binary Merkle Tree', () => { const rootAfterLeaves = '0x9e59abcd7c89011ba919f9141624acb32b4cc31c24e76c6d4f64b25093ef366c'; const size = 100; diff --git a/packages/merklesum/src/sumMerkleTree.test.ts b/packages/merklesum/src/sumMerkleTree.test.ts index 910d37864e5..b200f0a76f5 100644 --- a/packages/merklesum/src/sumMerkleTree.test.ts +++ b/packages/merklesum/src/sumMerkleTree.test.ts @@ -3,6 +3,9 @@ import { toHex } from '@fuel-ts/math'; import { calcRoot, constructTree, getProof } from './sumMerkleTree'; import Proof from './types/proof'; +/* + * @group common/unit + */ describe('Sum Merkle Tree', () => { const size = 100; const sumAfterLeaves = toHex(((size - 1) * size) / 2); diff --git a/packages/mnemonic/src/mnemonic.test.ts b/packages/mnemonic/src/mnemonic.test.ts index afee42aafaf..2b238ef0619 100644 --- a/packages/mnemonic/src/mnemonic.test.ts +++ b/packages/mnemonic/src/mnemonic.test.ts @@ -3,6 +3,9 @@ import { randomBytes } from '@fuel-ts/keystore'; import Mnemonic from './mnemonic'; import MnemonicSpec from './mnemonic-specs'; +/* + * @group common/unit + */ describe('Mnemonic', () => { const mnemonic = new Mnemonic(); diff --git a/packages/mnemonic/src/utils.test.ts b/packages/mnemonic/src/utils.test.ts index 9e20212f061..4b66e00aec4 100644 --- a/packages/mnemonic/src/utils.test.ts +++ b/packages/mnemonic/src/utils.test.ts @@ -1,5 +1,8 @@ import { getWords } from './utils'; +/* + * @group common/unit + */ describe('mnemonic utils', () => { const words = ['a', 'b', 'c']; diff --git a/packages/providers/src/provider.test.ts b/packages/providers/src/provider.test.ts index be68b0798ba..81c4f5d5e0c 100644 --- a/packages/providers/src/provider.test.ts +++ b/packages/providers/src/provider.test.ts @@ -8,6 +8,9 @@ import * as GraphQL from 'graphql-request'; import Provider from './provider'; +/* + * @group common/e2e + */ describe('Provider', () => { it('can getVersion()', async () => { const provider = new Provider('http://127.0.0.1:4000/graphql'); diff --git a/packages/script/src/script.test.ts b/packages/script/src/script.test.ts index 4e9580cbfab..27f56f11fec 100644 --- a/packages/script/src/script.test.ts +++ b/packages/script/src/script.test.ts @@ -108,6 +108,9 @@ type MyStruct = { arg_two: BigNumberish; }; +/* + * @group common/e2e + */ describe('Script', () => { let script: Script; beforeAll(async () => { diff --git a/packages/signer/src/signer.test.ts b/packages/signer/src/signer.test.ts index 12b9cbbaaf2..cf42de6a264 100644 --- a/packages/signer/src/signer.test.ts +++ b/packages/signer/src/signer.test.ts @@ -4,6 +4,9 @@ import signMessageTest from '@fuel-ts/testcases/src/signMessage.json'; import Signer from './signer'; +/* + * @group common/unit + */ describe('Signer', () => { it('Initialize publicKey and address for new signer instance', async () => { const signer = new Signer(signMessageTest.privateKey); diff --git a/packages/sparsemerkle/src/sparseMerkleTree.test.ts b/packages/sparsemerkle/src/sparseMerkleTree.test.ts index de1d38606fd..39f337945c2 100644 --- a/packages/sparsemerkle/src/sparseMerkleTree.test.ts +++ b/packages/sparsemerkle/src/sparseMerkleTree.test.ts @@ -4,6 +4,9 @@ import { hash } from '@fuel-ts/merkle-shared'; import DeepSparseMerkleSubTree from './deepSparseMerkleSubTree'; import SparseMerkleTree from './sparseMerkleTree'; +/* + * @group common/unit + */ describe('Sparse Merkle Tree', () => { it('Update and delete', async () => { const smt = new SparseMerkleTree(); diff --git a/packages/transactions/src/coders/byte-array.test.ts b/packages/transactions/src/coders/byte-array.test.ts index faf2f07cc42..056f308d130 100644 --- a/packages/transactions/src/coders/byte-array.test.ts +++ b/packages/transactions/src/coders/byte-array.test.ts @@ -2,6 +2,9 @@ import { arrayify, hexlify } from '@ethersproject/bytes'; import { ByteArrayCoder } from './byte-array'; +/* + * @group common/unit + */ describe('ByteArrayCoder', () => { it('Can encode empty byte[]', () => { const bytes = arrayify('0x'); diff --git a/packages/transactions/src/coders/input.test.ts b/packages/transactions/src/coders/input.test.ts index 9d58f1eb338..141a7a4aab4 100644 --- a/packages/transactions/src/coders/input.test.ts +++ b/packages/transactions/src/coders/input.test.ts @@ -6,6 +6,9 @@ import { InputMessageCoder, InputCoder, InputType } from './input'; const B256 = '0xd5579c46dfcc7f18207013e65b44e4cb4e2c2298f4ac457ba8f82743f31e930b'; +/* + * @group common/unit + */ describe('InputCoder', () => { it('Can encode Coin', () => { const input: Input = { diff --git a/packages/transactions/src/coders/output.test.ts b/packages/transactions/src/coders/output.test.ts index 1245d5154cd..45444779973 100644 --- a/packages/transactions/src/coders/output.test.ts +++ b/packages/transactions/src/coders/output.test.ts @@ -6,6 +6,9 @@ import { OutputCoder, OutputType } from './output'; const B256 = '0xd5579c46dfcc7f18207013e65b44e4cb4e2c2298f4ac457ba8f82743f31e930b'; +/* + * @group common/unit + */ describe('OutputCoder', () => { it('Can encode Coin', () => { const output: Output = { diff --git a/packages/transactions/src/coders/receipt.test.ts b/packages/transactions/src/coders/receipt.test.ts index 32cd2dcc1d1..8ba311d1b3d 100644 --- a/packages/transactions/src/coders/receipt.test.ts +++ b/packages/transactions/src/coders/receipt.test.ts @@ -10,6 +10,9 @@ const B256_ALT2 = '0x68b401b682ba0c9018150cca596358a6b98576337ea10b9cfb0d02441b3 const B256_ALT3 = '0xeb03488970d05ea240c788a0ea2e07176cc5317b7c7c89f26ac5282bbcd445bd'; const B256_ALT4 = '0x2f6d40e3ac1a172fb9445f9843440a0fc383bea238a7a35a77a3c73d36902992'; +/* + * @group common/unit + */ describe('ReceiptCoder', () => { it('Can encode Call', () => { const receipt: Receipt = { diff --git a/packages/transactions/src/coders/storage-slot.test.ts b/packages/transactions/src/coders/storage-slot.test.ts index 16a0f7022f2..fdcc804fb19 100644 --- a/packages/transactions/src/coders/storage-slot.test.ts +++ b/packages/transactions/src/coders/storage-slot.test.ts @@ -4,6 +4,9 @@ import { ZeroBytes32 } from '@fuel-ts/constants'; import type { StorageSlot } from './storage-slot'; import { StorageSlotCoder } from './storage-slot'; +/* + * @group common/unit + */ describe('StorageSlotCoder', () => { it('Can encode and decode', () => { const storageSlot: StorageSlot = { diff --git a/packages/transactions/src/coders/transaction.test.ts b/packages/transactions/src/coders/transaction.test.ts index 53de24f9193..f15061f71f9 100644 --- a/packages/transactions/src/coders/transaction.test.ts +++ b/packages/transactions/src/coders/transaction.test.ts @@ -11,6 +11,9 @@ const U32 = 1000; const U16 = 32; const U8 = 1; +/* + * @group common/unit + */ describe('TransactionCoder', () => { it('Can encode/decode TransactionScript without inputs, outputs and witnesses', () => { const transaction: Transaction = { diff --git a/packages/transactions/src/coders/tx-pointer.test.ts b/packages/transactions/src/coders/tx-pointer.test.ts index 58d4ff0ed76..896d869ad93 100644 --- a/packages/transactions/src/coders/tx-pointer.test.ts +++ b/packages/transactions/src/coders/tx-pointer.test.ts @@ -5,6 +5,9 @@ import { TxPointerCoder } from './tx-pointer'; const B256 = '0xd5579c46dfcc7f18207013e65b44e4cb4e2c2298f4ac457ba8f82743f31e930b'; +/* + * @group common/unit + */ describe('TxPointerCoder', () => { it('can encode TxPointer', () => { const txPointer: TxPointer = { diff --git a/packages/transactions/src/coders/utxo-id.test.ts b/packages/transactions/src/coders/utxo-id.test.ts index 31d5c31ba31..606f8d354ab 100644 --- a/packages/transactions/src/coders/utxo-id.test.ts +++ b/packages/transactions/src/coders/utxo-id.test.ts @@ -5,6 +5,9 @@ import { UtxoIdCoder } from './utxo-id'; const B256 = '0xd5579c46dfcc7f18207013e65b44e4cb4e2c2298f4ac457ba8f82743f31e930b'; +/* + * @group common/unit + */ describe('UtxoIdCoder', () => { it('can encode UtxoId', () => { const utxoId: UtxoId = { diff --git a/packages/transactions/src/coders/witness.test.ts b/packages/transactions/src/coders/witness.test.ts index 201a50f4269..8a2ab832a81 100644 --- a/packages/transactions/src/coders/witness.test.ts +++ b/packages/transactions/src/coders/witness.test.ts @@ -3,6 +3,9 @@ import { arrayify, hexlify } from '@ethersproject/bytes'; import type { Witness } from './witness'; import { WitnessCoder } from './witness'; +/* + * @group common/unit + */ describe('WitnessCoder', () => { it('Can encode empty Witness', () => { const witness: Witness = { diff --git a/packages/versions/src/cli.test.ts b/packages/versions/src/cli.test.ts index d7c1036c2d4..d4e5eed0dd9 100644 --- a/packages/versions/src/cli.test.ts +++ b/packages/versions/src/cli.test.ts @@ -4,6 +4,9 @@ import * as compareUserVersionsMod from './lib/compareUserVersions'; import * as getSupportedVersionsMod from './lib/getSupportedVersions'; import * as getUserVersionsMod from './lib/getUserVersions'; +/* + * @group node/unit + */ describe('cli.js', () => { // hooks beforeEach(jest.clearAllMocks); diff --git a/packages/versions/src/index.test.ts b/packages/versions/src/index.test.ts index e13e1af6dec..a7c9bcd7657 100644 --- a/packages/versions/src/index.test.ts +++ b/packages/versions/src/index.test.ts @@ -1,5 +1,8 @@ import * as indexMod from './index'; +/* + * @group common/unit + */ describe('index.js', () => { test('should export versions constant', async () => { expect(indexMod.versions).toBeTruthy(); diff --git a/packages/versions/src/lib/colorizeUserVersion.test.ts b/packages/versions/src/lib/colorizeUserVersion.test.ts index 19865160dbf..499bf9eaa93 100644 --- a/packages/versions/src/lib/colorizeUserVersion.test.ts +++ b/packages/versions/src/lib/colorizeUserVersion.test.ts @@ -2,6 +2,9 @@ import { cyan, red, green } from 'chalk'; import { colorizeUserVersion } from './colorizeUserVersion'; +/* + * @group node/unit + */ describe('colorizeUserVersion.js', () => { test('should colorize user versions just fine', async () => { const version = '1.0.0'; diff --git a/packages/versions/src/lib/compareUserVersions.test.ts b/packages/versions/src/lib/compareUserVersions.test.ts index 649c7dd3be7..e03d8c0a145 100644 --- a/packages/versions/src/lib/compareUserVersions.test.ts +++ b/packages/versions/src/lib/compareUserVersions.test.ts @@ -1,6 +1,9 @@ import { compareUserVersions } from './compareUserVersions'; import * as getSupportedVersionsMod from './getSupportedVersions'; +/* + * @group node/unit + */ describe('compareVersions.js', () => { /* Hooks diff --git a/packages/versions/src/lib/getSupportedVersions.test.ts b/packages/versions/src/lib/getSupportedVersions.test.ts index f166c77bd04..af4880532a1 100644 --- a/packages/versions/src/lib/getSupportedVersions.test.ts +++ b/packages/versions/src/lib/getSupportedVersions.test.ts @@ -1,5 +1,8 @@ import { getSupportedVersions, thisVersionOrDefault } from './getSupportedVersions'; +/* + * @group node/unit + */ describe('getSupportedVersions.js', () => { test('should return received version of default', async () => { expect(thisVersionOrDefault()).toEqual('0.0.0'); diff --git a/packages/versions/src/lib/getUserVersions.test.ts b/packages/versions/src/lib/getUserVersions.test.ts index 6bddc1dfad6..6576571fe54 100644 --- a/packages/versions/src/lib/getUserVersions.test.ts +++ b/packages/versions/src/lib/getUserVersions.test.ts @@ -2,6 +2,9 @@ import * as execSyncProxyMod from '../proxies/execSync'; import { getUserVersions } from './getUserVersions'; +/* + * @group node/unit + */ describe('getUserVersions.js', () => { /* Test (mocking) utility diff --git a/packages/wallet-manager/src/storages/memory-storage.test.ts b/packages/wallet-manager/src/storages/memory-storage.test.ts index 77e64a640bb..99e2e5efec1 100644 --- a/packages/wallet-manager/src/storages/memory-storage.test.ts +++ b/packages/wallet-manager/src/storages/memory-storage.test.ts @@ -1,5 +1,8 @@ import MemoryStorage from './memory-storage'; +/* + * @group common/unit + */ describe('MemoryStorage', () => { it('Test storage operations', async () => { const storage = new MemoryStorage(); diff --git a/packages/wallet-manager/src/vaults/mnemonic-vault.test.ts b/packages/wallet-manager/src/vaults/mnemonic-vault.test.ts index 91deef44e84..4cfbe7a88f3 100644 --- a/packages/wallet-manager/src/vaults/mnemonic-vault.test.ts +++ b/packages/wallet-manager/src/vaults/mnemonic-vault.test.ts @@ -4,6 +4,9 @@ import walletManagerSpec from '../wallet-manager-spec'; import { MnemonicVault } from './mnemonic-vault'; +/* + * @group common/unit + */ describe('MnemonicVault', () => { it('Get wallet instance', async () => { const vault = new MnemonicVault({ diff --git a/packages/wallet-manager/src/vaults/privatekey-vault.test.ts b/packages/wallet-manager/src/vaults/privatekey-vault.test.ts index de840376a76..38f72adac27 100644 --- a/packages/wallet-manager/src/vaults/privatekey-vault.test.ts +++ b/packages/wallet-manager/src/vaults/privatekey-vault.test.ts @@ -2,6 +2,9 @@ import { Wallet } from '@fuel-ts/wallet'; import { PrivateKeyVault } from './privatekey-vault'; +/* + * @group common/unit + */ describe('PrivateKeyVault', () => { const walletSpec = Wallet.generate(); diff --git a/packages/wallet-manager/src/wallet-manager.test.ts b/packages/wallet-manager/src/wallet-manager.test.ts index e1c0af06ec5..377eb5f87e6 100644 --- a/packages/wallet-manager/src/wallet-manager.test.ts +++ b/packages/wallet-manager/src/wallet-manager.test.ts @@ -8,6 +8,9 @@ import type { VaultConfig } from './types'; import { WalletManager } from './wallet-manager'; import WalletManagerSpec from './wallet-manager-spec'; +/* + * @group common/unit + */ describe('Wallet Manager', () => { const setupWallet = async (config: VaultConfig) => { // #region typedoc:wallet-manager-mnemonic diff --git a/packages/wallet/src/transfer.test.ts b/packages/wallet/src/transfer.test.ts index e9670c0717c..54d5c61d546 100644 --- a/packages/wallet/src/transfer.test.ts +++ b/packages/wallet/src/transfer.test.ts @@ -6,6 +6,9 @@ import { Provider, ScriptTransactionRequest } from '@fuel-ts/providers'; import { generateTestWallet } from '../test/utils/generateTestWallet'; +/* + * @group common/e2e + */ describe('Wallet', () => { it('can transfer a single type of coin to a single destination', async () => { // #region typedoc:wallet-transfer diff --git a/packages/wallet/src/wallet-locked.test.ts b/packages/wallet/src/wallet-locked.test.ts index 6e86626000c..5eaf9006c90 100644 --- a/packages/wallet/src/wallet-locked.test.ts +++ b/packages/wallet/src/wallet-locked.test.ts @@ -3,6 +3,9 @@ import { bn } from '@fuel-ts/math'; import { Wallet } from './wallet'; import type { WalletUnlocked } from './wallets'; +/* + * @group common/unit + */ describe('WalletLocked', () => { let wallet: WalletUnlocked; const assets = [ diff --git a/packages/wallet/src/wallet-unlocked.test.ts b/packages/wallet/src/wallet-unlocked.test.ts index df4c7b67bbd..4d287f24194 100644 --- a/packages/wallet/src/wallet-unlocked.test.ts +++ b/packages/wallet/src/wallet-unlocked.test.ts @@ -10,6 +10,9 @@ import signTransactionTest from '@fuel-ts/testcases/src/signTransaction.json'; import walletSpec from './wallet-spec'; import { WalletLocked, WalletUnlocked } from './wallets'; +/* + * @group common/unit + */ describe('WalletUnlocked', () => { it('Instantiate a new wallet', async () => { const wallet = new WalletUnlocked(signMessageTest.privateKey); diff --git a/packages/wallet/src/wallet.test.ts b/packages/wallet/src/wallet.test.ts index b0934f54b0f..6820c4f2c9b 100644 --- a/packages/wallet/src/wallet.test.ts +++ b/packages/wallet/src/wallet.test.ts @@ -9,6 +9,9 @@ import { FUEL_NETWORK_URL } from './constants'; import { Wallet } from './wallet'; import type { WalletUnlocked } from './wallets'; +/* + * @group common/unit + */ describe('Wallet', () => { let wallet: WalletUnlocked; diff --git a/packages/wordlists/src/wordlists.test.ts b/packages/wordlists/src/wordlists.test.ts index ca98da15298..e4d5a0e486d 100644 --- a/packages/wordlists/src/wordlists.test.ts +++ b/packages/wordlists/src/wordlists.test.ts @@ -2,6 +2,9 @@ import { createHash } from 'crypto'; import { english } from './words/english'; +/* + * @group common/unit + */ const checksum = (wordlists: string[]) => createHash('sha256') .update(Buffer.from(`${wordlists.join('\n')}\n`)) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6829f8c0cd0..224cd90a735 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -32,6 +32,7 @@ importers: ethers: ^5.7.2 forc-bin: workspace:* jest: ^29.3.1 + jest-runner-groups: ^2.2.0 markdownlint: ^0.23.1 markdownlint-cli: ^0.27.1 node-fetch: ^2.6.7 @@ -78,6 +79,7 @@ importers: ethers: 5.7.2 forc-bin: link:packages/forc-bin jest: 29.3.1_t5wpzltkkzdw6ng6jmtbqvsf2q + jest-runner-groups: 2.2.0_qrt5due4lpwhtnujr3g74bqrki markdownlint: 0.23.1 markdownlint-cli: 0.27.1 node-fetch: 2.6.7 @@ -6321,6 +6323,17 @@ packages: slash: 3.0.0 dev: true + /jest-runner-groups/2.2.0_qrt5due4lpwhtnujr3g74bqrki: + resolution: {integrity: sha512-Sp/B9ZX0CDAKa9dIkgH0sGyl2eDuScV4SVvOxqhBMxqWpsNAkmol/C58aTFmPWZj+C0ZTW1r1BSu66MTCN+voA==} + engines: {node: '>= 10.14.2'} + peerDependencies: + jest-docblock: '>= 24' + jest-runner: '>= 24' + dependencies: + jest-docblock: 29.2.0 + jest-runner: 29.3.1 + dev: true + /jest-runner/29.3.1: resolution: {integrity: sha512-oFvcwRNrKMtE6u9+AQPMATxFcTySyKfLhvso7Sdk/rNpbhg4g2GAGCopiInk1OP4q6gz3n6MajW4+fnHWlU3bA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} From 28fbf75c7c05ec007b8404a5725cdf0cd3fc4900 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Fri, 13 Jan 2023 11:18:16 +0530 Subject: [PATCH 02/47] add `jsdom` and new workflow file to test --- .github/workflows/test-new-setup.yaml | 63 ++++++ package.json | 1 + pnpm-lock.yaml | 304 ++++++++++++++++++++++++++ 3 files changed, 368 insertions(+) create mode 100644 .github/workflows/test-new-setup.yaml diff --git a/.github/workflows/test-new-setup.yaml b/.github/workflows/test-new-setup.yaml new file mode 100644 index 00000000000..3da8bde1227 --- /dev/null +++ b/.github/workflows/test-new-setup.yaml @@ -0,0 +1,63 @@ +name: "Test (new setup)" + +on: + pull_request: + push: + branches: + - master + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +jobs: + test: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: CI Setup + uses: ./.github/actions/ci-setup + + - name: Forc Format Check + run: pnpm forc:check + + - name: Build + run: | + BUILD_VERSION="0.0.0-${{ github.ref_name }}-$(git rev-parse --short $GITHUB_SHA)" pnpm build + + - name: Lint + run: | + pnpm lint + + - name: Checking PR Number + uses: jwalton/gh-find-current-pr@v1 + id: findPr + + - name: Node unit tests + run: pnpm test --group=node/unit + + - name: Node e2e tests + run: pnpm test --group=node/e2e + + - name: Node+browser unit tests + run: pnpm test --group=common/unit --env=jsdom && pnpm test --group=common/unit + + - name: Node+browser e2e tests + run: pnpm test --group=common/e2e --env=jsdom && pnpm test --group=common/e2e + + # - name: Run tests and publish coverage + # uses: ArtiomTr/jest-coverage-report-action@v2 + # if: ${{ steps.findPr.outputs.number }} + # with: + # github-token: ${{ secrets.GITHUB_TOKEN }} + # package-manager: pnpm + # annotations: failed-tests + # test-script: pnpm ci:test + # prnumber: ${{ steps.findPr.outputs.number }} + + # - name: Run tests no coverage publishing + # if: ${{ !steps.findPr.outputs.number }} + # run: | + # pnpm ci:test diff --git a/package.json b/package.json index 71e72f971db..3851ec46fd4 100644 --- a/package.json +++ b/package.json @@ -67,6 +67,7 @@ "ethers": "^5.7.2", "forc-bin": "workspace:*", "jest": "^29.3.1", + "jest-environment-jsdom": "^29.3.1", "jest-runner-groups": "^2.2.0", "markdownlint": "^0.23.1", "markdownlint-cli": "^0.27.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 224cd90a735..d400e510033 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -32,6 +32,7 @@ importers: ethers: ^5.7.2 forc-bin: workspace:* jest: ^29.3.1 + jest-environment-jsdom: ^29.3.1 jest-runner-groups: ^2.2.0 markdownlint: ^0.23.1 markdownlint-cli: ^0.27.1 @@ -79,6 +80,7 @@ importers: ethers: 5.7.2 forc-bin: link:packages/forc-bin jest: 29.3.1_t5wpzltkkzdw6ng6jmtbqvsf2q + jest-environment-jsdom: 29.3.1 jest-runner-groups: 2.2.0_qrt5due4lpwhtnujr3g74bqrki markdownlint: 0.23.1 markdownlint-cli: 0.27.1 @@ -2983,6 +2985,14 @@ packages: resolution: {integrity: sha512-FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA==} dev: true + /@types/jsdom/20.0.1: + resolution: {integrity: sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==} + dependencies: + '@types/node': 18.11.9 + '@types/tough-cookie': 4.0.2 + parse5: 7.1.2 + dev: true + /@types/json-schema/7.0.11: resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==} dev: true @@ -3099,6 +3109,10 @@ packages: resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==} dev: true + /@types/tough-cookie/4.0.2: + resolution: {integrity: sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==} + dev: true + /@types/web/0.0.65: resolution: {integrity: sha512-dl7VRSYBhxhOVxHA/ec8e7EzGXSQJrrGvRgLQWxusaJk1oT4I9nLpWiqsxekYI2eAEuet05toEm+rByL0G8x2Q==} dev: true @@ -3294,6 +3308,10 @@ packages: - encoding dev: true + /abab/2.0.6: + resolution: {integrity: sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==} + dev: true + /abort-controller/3.0.0: resolution: {integrity: sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==} engines: {node: '>=6.5'} @@ -3301,6 +3319,13 @@ packages: event-target-shim: 5.0.1 dev: true + /acorn-globals/7.0.1: + resolution: {integrity: sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==} + dependencies: + acorn: 8.8.1 + acorn-walk: 8.2.0 + dev: true + /acorn-jsx/5.3.2_acorn@8.8.1: resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} peerDependencies: @@ -4153,6 +4178,21 @@ packages: which: 2.0.2 dev: true + /cssom/0.3.8: + resolution: {integrity: sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==} + dev: true + + /cssom/0.5.0: + resolution: {integrity: sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==} + dev: true + + /cssstyle/2.3.0: + resolution: {integrity: sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==} + engines: {node: '>=8'} + dependencies: + cssom: 0.3.8 + dev: true + /csv-generate/3.4.3: resolution: {integrity: sha512-w/T+rqR0vwvHqWs/1ZyMDWtHHSJaN06klRqJXBEpDJaM/+dZkso0OKh1VcuuYvK3XM53KysVNq8Ko/epCK8wOw==} dev: true @@ -4179,6 +4219,15 @@ packages: resolution: {integrity: sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==} dev: true + /data-urls/3.0.2: + resolution: {integrity: sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==} + engines: {node: '>=12'} + dependencies: + abab: 2.0.6 + whatwg-mimetype: 3.0.0 + whatwg-url: 11.0.0 + dev: true + /dataloader/1.4.0: resolution: {integrity: sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==} dev: true @@ -4238,6 +4287,10 @@ packages: engines: {node: '>=0.10.0'} dev: true + /decimal.js/10.4.3: + resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==} + dev: true + /dedent/0.7.0: resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==} dev: true @@ -4325,6 +4378,13 @@ packages: esutils: 2.0.3 dev: true + /domexception/4.0.0: + resolution: {integrity: sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==} + engines: {node: '>=12'} + dependencies: + webidl-conversions: 7.0.0 + dev: true + /dot-case/3.0.4: resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==} dependencies: @@ -4404,6 +4464,11 @@ packages: resolution: {integrity: sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==} dev: true + /entities/4.4.0: + resolution: {integrity: sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==} + engines: {node: '>=0.12'} + dev: true + /error-ex/1.3.2: resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==} dependencies: @@ -4684,6 +4749,19 @@ packages: engines: {node: '>=10'} dev: true + /escodegen/2.0.0: + resolution: {integrity: sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==} + engines: {node: '>=6.0'} + hasBin: true + dependencies: + esprima: 4.0.1 + estraverse: 5.3.0 + esutils: 2.0.3 + optionator: 0.8.3 + optionalDependencies: + source-map: 0.6.1 + dev: true + /eslint-config-airbnb-base/15.0.0_ktrec6dplf4now6nlbc6d67jee: resolution: {integrity: sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==} engines: {node: ^10.12.0 || >=12.0.0} @@ -5259,6 +5337,15 @@ packages: combined-stream: 1.0.8 mime-types: 2.1.35 + /form-data/4.0.0: + resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==} + engines: {node: '>= 6'} + dependencies: + asynckit: 0.4.0 + combined-stream: 1.0.8 + mime-types: 2.1.35 + dev: true + /formdata-node/4.4.1: resolution: {integrity: sha512-0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ==} engines: {node: '>= 12.20'} @@ -5605,6 +5692,13 @@ packages: resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==} dev: true + /html-encoding-sniffer/3.0.0: + resolution: {integrity: sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==} + engines: {node: '>=12'} + dependencies: + whatwg-encoding: 2.0.0 + dev: true + /html-escaper/2.0.2: resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==} dev: true @@ -5646,6 +5740,13 @@ packages: safer-buffer: 2.1.2 dev: true + /iconv-lite/0.6.3: + resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==} + engines: {node: '>=0.10.0'} + dependencies: + safer-buffer: 2.1.2 + dev: true + /ieee754/1.2.1: resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==} dev: true @@ -5878,6 +5979,10 @@ packages: engines: {node: '>=0.10.0'} dev: true + /is-potential-custom-element-name/1.0.1: + resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==} + dev: true + /is-regex/1.1.4: resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==} engines: {node: '>= 0.4'} @@ -6203,6 +6308,29 @@ packages: pretty-format: 29.3.1 dev: true + /jest-environment-jsdom/29.3.1: + resolution: {integrity: sha512-G46nKgiez2Gy4zvYNhayfMEAFlVHhWfncqvqS6yCd0i+a4NsSUD2WtrKSaYQrYiLQaupHXxCRi8xxVL2M9PbhA==} + engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} + peerDependencies: + canvas: ^2.5.0 + peerDependenciesMeta: + canvas: + optional: true + dependencies: + '@jest/environment': 29.3.1 + '@jest/fake-timers': 29.3.1 + '@jest/types': 29.3.1 + '@types/jsdom': 20.0.1 + '@types/node': 18.11.9 + jest-mock: 29.3.1 + jest-util: 29.3.1 + jsdom: 20.0.3 + transitivePeerDependencies: + - bufferutil + - supports-color + - utf-8-validate + dev: true + /jest-environment-node/29.3.1: resolution: {integrity: sha512-xm2THL18Xf5sIHoU7OThBPtuH6Lerd+Y1NLYiZJlkE3hbE+7N7r8uvHIl/FkZ5ymKXJe/11SQuf3fv4v6rUMag==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} @@ -6533,6 +6661,47 @@ packages: engines: {node: '>=12.0.0'} dev: true + /jsdom/20.0.3: + resolution: {integrity: sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==} + engines: {node: '>=14'} + peerDependencies: + canvas: ^2.5.0 + peerDependenciesMeta: + canvas: + optional: true + dependencies: + abab: 2.0.6 + acorn: 8.8.1 + acorn-globals: 7.0.1 + cssom: 0.5.0 + cssstyle: 2.3.0 + data-urls: 3.0.2 + decimal.js: 10.4.3 + domexception: 4.0.0 + escodegen: 2.0.0 + form-data: 4.0.0 + html-encoding-sniffer: 3.0.0 + http-proxy-agent: 5.0.0 + https-proxy-agent: 5.0.1 + is-potential-custom-element-name: 1.0.1 + nwsapi: 2.2.2 + parse5: 7.1.2 + saxes: 6.0.0 + symbol-tree: 3.2.4 + tough-cookie: 4.1.2 + w3c-xmlserializer: 4.0.0 + webidl-conversions: 7.0.0 + whatwg-encoding: 2.0.0 + whatwg-mimetype: 3.0.0 + whatwg-url: 11.0.0 + ws: 8.11.0 + xml-name-validator: 4.0.0 + transitivePeerDependencies: + - bufferutil + - supports-color + - utf-8-validate + dev: true + /jsesc/2.5.2: resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==} engines: {node: '>=4'} @@ -6669,6 +6838,14 @@ packages: engines: {node: '>=6'} dev: true + /levn/0.3.0: + resolution: {integrity: sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==} + engines: {node: '>= 0.8.0'} + dependencies: + prelude-ls: 1.1.2 + type-check: 0.3.2 + dev: true + /levn/0.4.1: resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} engines: {node: '>= 0.8.0'} @@ -7201,6 +7378,10 @@ packages: resolution: {integrity: sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==} dev: true + /nwsapi/2.2.2: + resolution: {integrity: sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==} + dev: true + /object-assign/4.1.1: resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} engines: {node: '>=0.10.0'} @@ -7280,6 +7461,18 @@ packages: is-wsl: 2.2.0 dev: true + /optionator/0.8.3: + resolution: {integrity: sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==} + engines: {node: '>= 0.8.0'} + dependencies: + deep-is: 0.1.4 + fast-levenshtein: 2.0.6 + levn: 0.3.0 + prelude-ls: 1.1.2 + type-check: 0.3.2 + word-wrap: 1.2.3 + dev: true + /optionator/0.9.1: resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==} engines: {node: '>= 0.8.0'} @@ -7409,6 +7602,12 @@ packages: lines-and-columns: 1.2.4 dev: true + /parse5/7.1.2: + resolution: {integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==} + dependencies: + entities: 4.4.0 + dev: true + /pascal-case/3.1.2: resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==} dependencies: @@ -7533,6 +7732,11 @@ packages: which-pm: 2.0.0 dev: true + /prelude-ls/1.1.2: + resolution: {integrity: sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==} + engines: {node: '>= 0.8.0'} + dev: true + /prelude-ls/1.2.1: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} @@ -7586,6 +7790,10 @@ packages: resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==} dev: true + /psl/1.9.0: + resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==} + dev: true + /punycode/2.1.1: resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==} engines: {node: '>=6'} @@ -7607,6 +7815,10 @@ packages: engines: {node: '>=0.6.0', teleport: '>=0.2.0'} dev: true + /querystringify/2.2.0: + resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==} + dev: true + /queue-microtask/1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} dev: true @@ -7756,6 +7968,10 @@ packages: resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==} dev: true + /requires-port/1.0.0: + resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==} + dev: true + /resolve-cwd/3.0.0: resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==} engines: {node: '>=8'} @@ -7866,6 +8082,13 @@ packages: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} dev: true + /saxes/6.0.0: + resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==} + engines: {node: '>=v12.22.7'} + dependencies: + xmlchars: 2.2.0 + dev: true + /scrypt-js/3.0.1: resolution: {integrity: sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==} dev: true @@ -8237,6 +8460,10 @@ packages: tslib: 2.4.1 dev: true + /symbol-tree/3.2.4: + resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==} + dev: true + /term-size/2.2.1: resolution: {integrity: sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==} engines: {node: '>=8'} @@ -8301,6 +8528,16 @@ packages: is-number: 7.0.0 dev: true + /tough-cookie/4.1.2: + resolution: {integrity: sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==} + engines: {node: '>=6'} + dependencies: + psl: 1.9.0 + punycode: 2.1.1 + universalify: 0.2.0 + url-parse: 1.5.10 + dev: true + /tr46/0.0.3: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} @@ -8310,6 +8547,13 @@ packages: punycode: 2.1.1 dev: true + /tr46/3.0.0: + resolution: {integrity: sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==} + engines: {node: '>=12'} + dependencies: + punycode: 2.1.1 + dev: true + /tree-kill/1.2.2: resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} hasBin: true @@ -8581,6 +8825,13 @@ packages: turbo-windows-arm64: 1.6.3 dev: true + /type-check/0.3.2: + resolution: {integrity: sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==} + engines: {node: '>= 0.8.0'} + dependencies: + prelude-ls: 1.1.2 + dev: true + /type-check/0.4.0: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} engines: {node: '>= 0.8.0'} @@ -8711,6 +8962,11 @@ packages: engines: {node: '>= 4.0.0'} dev: true + /universalify/0.2.0: + resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==} + engines: {node: '>= 4.0.0'} + dev: true + /unixify/1.0.0: resolution: {integrity: sha512-6bc58dPYhCMHHuwxldQxO3RRNZ4eCogZ/st++0+fcC1nr0jiGUtAdBJ2qzmLQWSxbtz42pWt4QQMiZ9HvZf5cg==} engines: {node: '>=0.10.0'} @@ -8747,6 +9003,13 @@ packages: punycode: 2.1.1 dev: true + /url-parse/1.5.10: + resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==} + dependencies: + querystringify: 2.2.0 + requires-port: 1.0.0 + dev: true + /util-deprecate/1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} dev: true @@ -8784,6 +9047,13 @@ packages: resolution: {integrity: sha512-gu73tuZfJgu+mvCSy4UZwd2JXykjK9zAZsfmDeut5dx/1a7FeTk0XwJsSuqQn+cuMCGVbIBfl+s53X4T19DnzQ==} dev: true + /w3c-xmlserializer/4.0.0: + resolution: {integrity: sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==} + engines: {node: '>=14'} + dependencies: + xml-name-validator: 4.0.0 + dev: true + /walker/1.0.8: resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==} dependencies: @@ -8823,10 +9093,35 @@ packages: resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==} dev: true + /webidl-conversions/7.0.0: + resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==} + engines: {node: '>=12'} + dev: true + + /whatwg-encoding/2.0.0: + resolution: {integrity: sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==} + engines: {node: '>=12'} + dependencies: + iconv-lite: 0.6.3 + dev: true + /whatwg-fetch/3.6.2: resolution: {integrity: sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==} dev: true + /whatwg-mimetype/3.0.0: + resolution: {integrity: sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==} + engines: {node: '>=12'} + dev: true + + /whatwg-url/11.0.0: + resolution: {integrity: sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==} + engines: {node: '>=12'} + dependencies: + tr46: 3.0.0 + webidl-conversions: 7.0.0 + dev: true + /whatwg-url/5.0.0: resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==} dependencies: @@ -8941,6 +9236,15 @@ packages: optional: true dev: true + /xml-name-validator/4.0.0: + resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==} + engines: {node: '>=12'} + dev: true + + /xmlchars/2.2.0: + resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==} + dev: true + /y18n/4.0.3: resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==} dev: true From df2e50881845d9ca0369175e036ac4513bce5d9f Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Fri, 13 Jan 2023 11:24:34 +0530 Subject: [PATCH 03/47] fix typo in workflow file --- .github/workflows/test-new-setup.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-new-setup.yaml b/.github/workflows/test-new-setup.yaml index 3da8bde1227..8f8c4599c64 100644 --- a/.github/workflows/test-new-setup.yaml +++ b/.github/workflows/test-new-setup.yaml @@ -36,16 +36,16 @@ jobs: id: findPr - name: Node unit tests - run: pnpm test --group=node/unit + run: pnpm test --groups=node/unit - name: Node e2e tests - run: pnpm test --group=node/e2e + run: pnpm test --groups=node/e2e - name: Node+browser unit tests - run: pnpm test --group=common/unit --env=jsdom && pnpm test --group=common/unit + run: pnpm test --groups=common/unit --env=jsdom && pnpm test --groups=common/unit - name: Node+browser e2e tests - run: pnpm test --group=common/e2e --env=jsdom && pnpm test --group=common/e2e + run: pnpm test --groups=common/e2e --env=jsdom && pnpm test --groups=common/e2e # - name: Run tests and publish coverage # uses: ArtiomTr/jest-coverage-report-action@v2 From 5ccf2b68ee11949923bd62a9ccb7f63b1aab72a1 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Fri, 13 Jan 2023 11:29:26 +0530 Subject: [PATCH 04/47] Revert "fix typo in workflow file" This reverts commit df2e50881845d9ca0369175e036ac4513bce5d9f. --- .github/workflows/test-new-setup.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-new-setup.yaml b/.github/workflows/test-new-setup.yaml index 8f8c4599c64..3da8bde1227 100644 --- a/.github/workflows/test-new-setup.yaml +++ b/.github/workflows/test-new-setup.yaml @@ -36,16 +36,16 @@ jobs: id: findPr - name: Node unit tests - run: pnpm test --groups=node/unit + run: pnpm test --group=node/unit - name: Node e2e tests - run: pnpm test --groups=node/e2e + run: pnpm test --group=node/e2e - name: Node+browser unit tests - run: pnpm test --groups=common/unit --env=jsdom && pnpm test --groups=common/unit + run: pnpm test --group=common/unit --env=jsdom && pnpm test --group=common/unit - name: Node+browser e2e tests - run: pnpm test --groups=common/e2e --env=jsdom && pnpm test --groups=common/e2e + run: pnpm test --group=common/e2e --env=jsdom && pnpm test --group=common/e2e # - name: Run tests and publish coverage # uses: ArtiomTr/jest-coverage-report-action@v2 From 8799f16f198ce7aa7d026c3caa7f9b1a621f84ec Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Fri, 13 Jan 2023 11:32:26 +0530 Subject: [PATCH 05/47] fix usage of `pnpm test` in CI --- .github/workflows/test-new-setup.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-new-setup.yaml b/.github/workflows/test-new-setup.yaml index 3da8bde1227..0d6006798ad 100644 --- a/.github/workflows/test-new-setup.yaml +++ b/.github/workflows/test-new-setup.yaml @@ -36,16 +36,16 @@ jobs: id: findPr - name: Node unit tests - run: pnpm test --group=node/unit + run: pnpm test -- --group=node/unit - name: Node e2e tests - run: pnpm test --group=node/e2e + run: pnpm test -- --group=node/e2e - name: Node+browser unit tests - run: pnpm test --group=common/unit --env=jsdom && pnpm test --group=common/unit + run: pnpm test -- --group=common/unit --env=jsdom && pnpm test -- --group=common/unit - name: Node+browser e2e tests - run: pnpm test --group=common/e2e --env=jsdom && pnpm test --group=common/e2e + run: pnpm test -- --group=common/e2e --env=jsdom && pnpm test -- --group=common/e2e # - name: Run tests and publish coverage # uses: ArtiomTr/jest-coverage-report-action@v2 From 4abf41b2571b0bcdef2d556dc8094c0f29c9ed3c Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Fri, 13 Jan 2023 15:10:19 +0530 Subject: [PATCH 06/47] run all 4 test groups in parallel --- .github/workflows/browser-e2e-test.yaml | 32 ++++++++++++ .github/workflows/browser-unit-test.yaml | 32 ++++++++++++ .github/workflows/node-e2e-test.yaml | 32 ++++++++++++ .github/workflows/node-unit-test.yaml | 32 ++++++++++++ .github/workflows/test-new-setup.yaml | 63 ------------------------ 5 files changed, 128 insertions(+), 63 deletions(-) create mode 100644 .github/workflows/browser-e2e-test.yaml create mode 100644 .github/workflows/browser-unit-test.yaml create mode 100644 .github/workflows/node-e2e-test.yaml create mode 100644 .github/workflows/node-unit-test.yaml delete mode 100644 .github/workflows/test-new-setup.yaml diff --git a/.github/workflows/browser-e2e-test.yaml b/.github/workflows/browser-e2e-test.yaml new file mode 100644 index 00000000000..c040c076790 --- /dev/null +++ b/.github/workflows/browser-e2e-test.yaml @@ -0,0 +1,32 @@ +name: "Test (new setup)" + +on: + pull_request: + push: + branches: + - master + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +jobs: + test: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: CI Setup + uses: ./.github/actions/ci-setup + + - name: Build + run: | + BUILD_VERSION="0.0.0-${{ github.ref_name }}-$(git rev-parse --short $GITHUB_SHA)" pnpm build + + - name: Checking PR Number + uses: jwalton/gh-find-current-pr@v1 + id: findPr + + - name: Browser e2e tests + run: pnpm test -- --group=common/e2e --env=jsdom diff --git a/.github/workflows/browser-unit-test.yaml b/.github/workflows/browser-unit-test.yaml new file mode 100644 index 00000000000..aaa06e42b6c --- /dev/null +++ b/.github/workflows/browser-unit-test.yaml @@ -0,0 +1,32 @@ +name: "Test (new setup)" + +on: + pull_request: + push: + branches: + - master + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +jobs: + test: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: CI Setup + uses: ./.github/actions/ci-setup + + - name: Build + run: | + BUILD_VERSION="0.0.0-${{ github.ref_name }}-$(git rev-parse --short $GITHUB_SHA)" pnpm build + + - name: Checking PR Number + uses: jwalton/gh-find-current-pr@v1 + id: findPr + + - name: Browser unit tests + run: pnpm test -- --group=common/unit --env=jsdom diff --git a/.github/workflows/node-e2e-test.yaml b/.github/workflows/node-e2e-test.yaml new file mode 100644 index 00000000000..7cb32990a9c --- /dev/null +++ b/.github/workflows/node-e2e-test.yaml @@ -0,0 +1,32 @@ +name: "Test (new setup)" + +on: + pull_request: + push: + branches: + - master + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +jobs: + test: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: CI Setup + uses: ./.github/actions/ci-setup + + - name: Build + run: | + BUILD_VERSION="0.0.0-${{ github.ref_name }}-$(git rev-parse --short $GITHUB_SHA)" pnpm build + + - name: Checking PR Number + uses: jwalton/gh-find-current-pr@v1 + id: findPr + + - name: Node e2e tests + run: pnpm test -- --group=node/e2e --group=common/e2e diff --git a/.github/workflows/node-unit-test.yaml b/.github/workflows/node-unit-test.yaml new file mode 100644 index 00000000000..d0e90848912 --- /dev/null +++ b/.github/workflows/node-unit-test.yaml @@ -0,0 +1,32 @@ +name: "Test (new setup)" + +on: + pull_request: + push: + branches: + - master + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +jobs: + test: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: CI Setup + uses: ./.github/actions/ci-setup + + - name: Build + run: | + BUILD_VERSION="0.0.0-${{ github.ref_name }}-$(git rev-parse --short $GITHUB_SHA)" pnpm build + + - name: Checking PR Number + uses: jwalton/gh-find-current-pr@v1 + id: findPr + + - name: Node unit tests + run: pnpm test -- --group=node/unit --group=common/unit diff --git a/.github/workflows/test-new-setup.yaml b/.github/workflows/test-new-setup.yaml deleted file mode 100644 index 0d6006798ad..00000000000 --- a/.github/workflows/test-new-setup.yaml +++ /dev/null @@ -1,63 +0,0 @@ -name: "Test (new setup)" - -on: - pull_request: - push: - branches: - - master - -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -jobs: - test: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: CI Setup - uses: ./.github/actions/ci-setup - - - name: Forc Format Check - run: pnpm forc:check - - - name: Build - run: | - BUILD_VERSION="0.0.0-${{ github.ref_name }}-$(git rev-parse --short $GITHUB_SHA)" pnpm build - - - name: Lint - run: | - pnpm lint - - - name: Checking PR Number - uses: jwalton/gh-find-current-pr@v1 - id: findPr - - - name: Node unit tests - run: pnpm test -- --group=node/unit - - - name: Node e2e tests - run: pnpm test -- --group=node/e2e - - - name: Node+browser unit tests - run: pnpm test -- --group=common/unit --env=jsdom && pnpm test -- --group=common/unit - - - name: Node+browser e2e tests - run: pnpm test -- --group=common/e2e --env=jsdom && pnpm test -- --group=common/e2e - - # - name: Run tests and publish coverage - # uses: ArtiomTr/jest-coverage-report-action@v2 - # if: ${{ steps.findPr.outputs.number }} - # with: - # github-token: ${{ secrets.GITHUB_TOKEN }} - # package-manager: pnpm - # annotations: failed-tests - # test-script: pnpm ci:test - # prnumber: ${{ steps.findPr.outputs.number }} - - # - name: Run tests no coverage publishing - # if: ${{ !steps.findPr.outputs.number }} - # run: | - # pnpm ci:test From b647ccaf2b746ab566f635e9300339619e9c39b6 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Fri, 13 Jan 2023 15:12:11 +0530 Subject: [PATCH 07/47] rename workflow files --- .github/workflows/browser-e2e-test.yaml | 2 +- .github/workflows/browser-unit-test.yaml | 2 +- .github/workflows/node-e2e-test.yaml | 2 +- .github/workflows/node-unit-test.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/browser-e2e-test.yaml b/.github/workflows/browser-e2e-test.yaml index c040c076790..59e162ca401 100644 --- a/.github/workflows/browser-e2e-test.yaml +++ b/.github/workflows/browser-e2e-test.yaml @@ -1,4 +1,4 @@ -name: "Test (new setup)" +name: "Browser e2e tests" on: pull_request: diff --git a/.github/workflows/browser-unit-test.yaml b/.github/workflows/browser-unit-test.yaml index aaa06e42b6c..fca79948068 100644 --- a/.github/workflows/browser-unit-test.yaml +++ b/.github/workflows/browser-unit-test.yaml @@ -1,4 +1,4 @@ -name: "Test (new setup)" +name: "Browser unit tests" on: pull_request: diff --git a/.github/workflows/node-e2e-test.yaml b/.github/workflows/node-e2e-test.yaml index 7cb32990a9c..11275da8d9b 100644 --- a/.github/workflows/node-e2e-test.yaml +++ b/.github/workflows/node-e2e-test.yaml @@ -1,4 +1,4 @@ -name: "Test (new setup)" +name: "Node e2e tests" on: pull_request: diff --git a/.github/workflows/node-unit-test.yaml b/.github/workflows/node-unit-test.yaml index d0e90848912..86eddef2c9b 100644 --- a/.github/workflows/node-unit-test.yaml +++ b/.github/workflows/node-unit-test.yaml @@ -1,4 +1,4 @@ -name: "Test (new setup)" +name: "Node unit tests" on: pull_request: From 5aa382a0aced9b60def326a1af02be41c9396e89 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Mon, 16 Jan 2023 15:30:43 +0530 Subject: [PATCH 08/47] fix some misgrouped tests --- packages/wallet/src/wallet-locked.test.ts | 2 +- packages/wallet/src/wallet-unlocked.test.ts | 2 +- packages/wallet/src/wallet.test.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/wallet/src/wallet-locked.test.ts b/packages/wallet/src/wallet-locked.test.ts index 5eaf9006c90..f60146cc42d 100644 --- a/packages/wallet/src/wallet-locked.test.ts +++ b/packages/wallet/src/wallet-locked.test.ts @@ -4,7 +4,7 @@ import { Wallet } from './wallet'; import type { WalletUnlocked } from './wallets'; /* - * @group common/unit + * @group common/e2e */ describe('WalletLocked', () => { let wallet: WalletUnlocked; diff --git a/packages/wallet/src/wallet-unlocked.test.ts b/packages/wallet/src/wallet-unlocked.test.ts index 4d287f24194..3cbfc216a2a 100644 --- a/packages/wallet/src/wallet-unlocked.test.ts +++ b/packages/wallet/src/wallet-unlocked.test.ts @@ -11,7 +11,7 @@ import walletSpec from './wallet-spec'; import { WalletLocked, WalletUnlocked } from './wallets'; /* - * @group common/unit + * @group common/e2e */ describe('WalletUnlocked', () => { it('Instantiate a new wallet', async () => { diff --git a/packages/wallet/src/wallet.test.ts b/packages/wallet/src/wallet.test.ts index 6820c4f2c9b..9ca01ff76fe 100644 --- a/packages/wallet/src/wallet.test.ts +++ b/packages/wallet/src/wallet.test.ts @@ -10,7 +10,7 @@ import { Wallet } from './wallet'; import type { WalletUnlocked } from './wallets'; /* - * @group common/unit + * @group common/e2e */ describe('Wallet', () => { let wallet: WalletUnlocked; From 8e50548445cc0b7685037b8984de1cafe14fbc6f Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Mon, 16 Jan 2023 15:45:35 +0530 Subject: [PATCH 09/47] run services for e2e tests --- .github/workflows/browser-e2e-test.yaml | 6 ++++++ .github/workflows/node-e2e-test.yaml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/.github/workflows/browser-e2e-test.yaml b/.github/workflows/browser-e2e-test.yaml index 59e162ca401..13a7b1a87fe 100644 --- a/.github/workflows/browser-e2e-test.yaml +++ b/.github/workflows/browser-e2e-test.yaml @@ -28,5 +28,11 @@ jobs: uses: jwalton/gh-find-current-pr@v1 id: findPr + - name: Run services + run: pnpm services:run + - name: Browser e2e tests run: pnpm test -- --group=common/e2e --env=jsdom + + - name: Stop services + run: pnpm services:clean diff --git a/.github/workflows/node-e2e-test.yaml b/.github/workflows/node-e2e-test.yaml index 11275da8d9b..ef4875a4f55 100644 --- a/.github/workflows/node-e2e-test.yaml +++ b/.github/workflows/node-e2e-test.yaml @@ -28,5 +28,11 @@ jobs: uses: jwalton/gh-find-current-pr@v1 id: findPr + - name: Run services + run: pnpm services:run + - name: Node e2e tests run: pnpm test -- --group=node/e2e --group=common/e2e + + - name: Stop services + run: pnpm services:clean From 63d54a83c735bcd82dd51d29fb78946dd6207b14 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Mon, 16 Jan 2023 15:47:13 +0530 Subject: [PATCH 10/47] add empty changeset --- .changeset/spicy-llamas-fetch.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .changeset/spicy-llamas-fetch.md diff --git a/.changeset/spicy-llamas-fetch.md b/.changeset/spicy-llamas-fetch.md new file mode 100644 index 00000000000..a845151cc84 --- /dev/null +++ b/.changeset/spicy-llamas-fetch.md @@ -0,0 +1,2 @@ +--- +--- From 51d4bb4b4bdc8514769c89b2205b97c3f9c920cc Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Mon, 16 Jan 2023 16:01:33 +0530 Subject: [PATCH 11/47] polyfill `TextEncoder` and `TextDecoder` --- jest.env.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jest.env.ts b/jest.env.ts index b477c7117eb..7722143b13e 100644 --- a/jest.env.ts +++ b/jest.env.ts @@ -1,7 +1,12 @@ import { hexlify } from '@ethersproject/bytes'; +import { TextEncoder, TextDecoder } from 'util'; import faucets from './services/fuel-core/faucets.json'; +global.TextEncoder = TextEncoder; +// @ts-expect-error - incompatible types +global.TextDecoder = TextDecoder; + /** * Gets the private key for the current Jest worker. * From 4bc2268ad7a73bbc36ee158b939d9bd5b1765521 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Tue, 31 Jan 2023 15:10:26 +0530 Subject: [PATCH 12/47] use puppeteer for browser unit tests --- .github/workflows/browser-unit-test.yaml | 2 +- package.json | 1 + pnpm-lock.yaml | 165 +++++++++++++++++++++++ setup-puppeteer.ts | 12 ++ 4 files changed, 179 insertions(+), 1 deletion(-) create mode 100644 setup-puppeteer.ts diff --git a/.github/workflows/browser-unit-test.yaml b/.github/workflows/browser-unit-test.yaml index fca79948068..5b079a42e11 100644 --- a/.github/workflows/browser-unit-test.yaml +++ b/.github/workflows/browser-unit-test.yaml @@ -29,4 +29,4 @@ jobs: id: findPr - name: Browser unit tests - run: pnpm test -- --group=common/unit --env=jsdom + run: pnpm test -- --group=common/unit --setupFilesAfterEnv=./setup-puppeteer.ts diff --git a/package.json b/package.json index 38c9d691e59..e4479cf8cce 100644 --- a/package.json +++ b/package.json @@ -76,6 +76,7 @@ "npm-run-all": "^4.1.5", "open": "^8.4.0", "prettier": "^2.7.1", + "puppeteer": "^19.6.2", "shelljs": "^0.8.5", "ts-generator": "^0.1.1", "ts-jest": "^29.0.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dcb8f51f443..2e1256e3add 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -41,6 +41,7 @@ importers: npm-run-all: ^4.1.5 open: ^8.4.0 prettier: ^2.7.1 + puppeteer: ^19.6.2 shelljs: ^0.8.5 ts-generator: ^0.1.1 ts-jest: ^29.0.3 @@ -90,6 +91,7 @@ importers: npm-run-all: 4.1.5 open: 8.4.0 prettier: 2.8.0 + puppeteer: 19.6.2 shelljs: 0.8.5 ts-generator: 0.1.1 ts-jest: 29.0.3_brn6n65s3uoazv2wp6uiapfknm @@ -3135,6 +3137,14 @@ packages: '@types/yargs-parser': 21.0.0 dev: true + /@types/yauzl/2.10.0: + resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==} + requiresBuild: true + dependencies: + '@types/node': 18.11.9 + dev: true + optional: true + /@typescript-eslint/eslint-plugin/5.44.0_fnsv2sbzcckq65bwfk7a5xwslu: resolution: {integrity: sha512-j5ULd7FmmekcyWeArx+i8x7sdRHzAtXTkmDPthE4amxZOWKFK7bomoJ4r7PJ8K7PoMzD16U8MmuZFAonr1ERvw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -3745,6 +3755,10 @@ packages: node-int64: 0.4.0 dev: true + /buffer-crc32/0.2.13: + resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==} + dev: true + /buffer-equal-constant-time/1.0.1: resolution: {integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==} dev: true @@ -3904,6 +3918,10 @@ packages: fsevents: 2.3.2 dev: true + /chownr/1.1.4: + resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==} + dev: true + /ci-info/3.7.0: resolution: {integrity: sha512-2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog==} engines: {node: '>=8'} @@ -4141,6 +4159,16 @@ packages: yaml: 1.10.2 dev: true + /cosmiconfig/8.0.0: + resolution: {integrity: sha512-da1EafcpH6b/TD8vDRaWV7xFINlHlF6zKsGwS1TsuVJTZRkquaS5HTMq7uq6h31619QjbsYl21gVDOm32KM1vQ==} + engines: {node: '>=14'} + dependencies: + import-fresh: 3.3.0 + js-yaml: 4.1.0 + parse-json: 5.2.0 + path-type: 4.0.0 + dev: true + /create-require/1.1.1: resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==} dev: true @@ -4349,6 +4377,10 @@ packages: engines: {node: '>=8'} dev: true + /devtools-protocol/0.0.1082910: + resolution: {integrity: sha512-RqoZ2GmqaNxyx+99L/RemY5CkwG9D0WEfOKxekwCRXOGrDCep62ngezEJUVMq6rISYQ+085fJnWDQqGHlxVNww==} + dev: true + /diff-sequences/29.3.1: resolution: {integrity: sha512-hlM3QR272NXCi4pq+N4Kok4kOp6EsgOM3ZSpJI7Da3UAs+Ttsi8MRmB6trM/lhyzUxGfOgnpkHtgqm5Q/CTcfQ==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} @@ -4455,6 +4487,12 @@ packages: resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} dev: true + /end-of-stream/1.4.4: + resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==} + dependencies: + once: 1.4.0 + dev: true + /enquirer/2.3.6: resolution: {integrity: sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==} engines: {node: '>=8.6'} @@ -5214,6 +5252,20 @@ packages: resolution: {integrity: sha512-CvdFfHkC95B4bBBk36hcEmvdR2awOdhhVUYH6S/zrVj3477zven/fJMYg7121h4T1xHZC+tetUpubpAhxwI7hQ==} engines: {node: ^10.17.0 || ^12.0.0 || >= 13.7.0} + /extract-zip/2.0.1: + resolution: {integrity: sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==} + engines: {node: '>= 10.17.0'} + hasBin: true + dependencies: + debug: 4.3.4 + get-stream: 5.2.0 + yauzl: 2.10.0 + optionalDependencies: + '@types/yauzl': 2.10.0 + transitivePeerDependencies: + - supports-color + dev: true + /fast-deep-equal/3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} dev: true @@ -5271,6 +5323,12 @@ packages: - encoding dev: true + /fd-slicer/1.1.0: + resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==} + dependencies: + pend: 1.2.0 + dev: true + /figures/3.2.0: resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==} engines: {node: '>=8'} @@ -5356,6 +5414,10 @@ packages: web-streams-polyfill: 4.0.0-beta.3 dev: true + /fs-constants/1.0.0: + resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==} + dev: true + /fs-extra/7.0.1: resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==} engines: {node: '>=6 <7 || >=8'} @@ -5442,6 +5504,13 @@ packages: engines: {node: '>=10'} dev: true + /get-stream/5.2.0: + resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==} + engines: {node: '>=8'} + dependencies: + pump: 3.0.0 + dev: true + /get-stream/6.0.1: resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==} engines: {node: '>=10'} @@ -7257,6 +7326,10 @@ packages: engines: {node: '>= 8.0.0'} dev: true + /mkdirp-classic/0.5.3: + resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==} + dev: true + /mkdirp/0.5.6: resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==} hasBin: true @@ -7677,6 +7750,10 @@ packages: engines: {node: '>=8'} dev: true + /pend/1.2.0: + resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==} + dev: true + /picocolors/1.0.0: resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} dev: true @@ -7773,6 +7850,11 @@ packages: react-is: 18.2.0 dev: true + /progress/2.0.3: + resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==} + engines: {node: '>=0.4.0'} + dev: true + /promise/7.3.1: resolution: {integrity: sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==} dependencies: @@ -7795,6 +7877,10 @@ packages: react-is: 16.13.1 dev: true + /proxy-from-env/1.1.0: + resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==} + dev: true + /pseudomap/1.0.2: resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==} dev: true @@ -7803,11 +7889,56 @@ packages: resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==} dev: true + /pump/3.0.0: + resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==} + dependencies: + end-of-stream: 1.4.4 + once: 1.4.0 + dev: true + /punycode/2.1.1: resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==} engines: {node: '>=6'} dev: true + /puppeteer-core/19.6.2: + resolution: {integrity: sha512-il7uK658MNC1FlxPABvcnv1RdpDa9CaBFHzvtEsl+9Y4tbAJKZurkegpcvWeIWcRYGiuBIVo+t+ZSh3G82CCjw==} + engines: {node: '>=14.1.0'} + dependencies: + cross-fetch: 3.1.5 + debug: 4.3.4 + devtools-protocol: 0.0.1082910 + extract-zip: 2.0.1 + https-proxy-agent: 5.0.1 + proxy-from-env: 1.1.0 + rimraf: 3.0.2 + tar-fs: 2.1.1 + unbzip2-stream: 1.4.3 + ws: 8.11.0 + transitivePeerDependencies: + - bufferutil + - encoding + - supports-color + - utf-8-validate + dev: true + + /puppeteer/19.6.2: + resolution: {integrity: sha512-Y5OAXXwXLfJYbl0dEFg8JKIhvCGxn+UYaBW9yra9ErmIhkVroDnYusM6oYxJCt/YIfC2pQWhvhxoZyf/E5fV6w==} + engines: {node: '>=14.1.0'} + requiresBuild: true + dependencies: + cosmiconfig: 8.0.0 + https-proxy-agent: 5.0.1 + progress: 2.0.3 + proxy-from-env: 1.1.0 + puppeteer-core: 19.6.2 + transitivePeerDependencies: + - bufferutil + - encoding + - supports-color + - utf-8-validate + dev: true + /pvtsutils/1.3.2: resolution: {integrity: sha512-+Ipe2iNUyrZz+8K/2IOo+kKikdtfhRKzNpQbruF2URmqPtoqAs8g3xS7TJvFF2GcPXjh7DkqMnpVveRFq4PgEQ==} dependencies: @@ -8473,6 +8604,26 @@ packages: resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==} dev: true + /tar-fs/2.1.1: + resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==} + dependencies: + chownr: 1.1.4 + mkdirp-classic: 0.5.3 + pump: 3.0.0 + tar-stream: 2.2.0 + dev: true + + /tar-stream/2.2.0: + resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==} + engines: {node: '>=6'} + dependencies: + bl: 4.1.0 + end-of-stream: 1.4.4 + fs-constants: 1.0.0 + inherits: 2.0.4 + readable-stream: 3.6.0 + dev: true + /term-size/2.2.1: resolution: {integrity: sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==} engines: {node: '>=8'} @@ -8954,6 +9105,13 @@ packages: which-boxed-primitive: 1.0.2 dev: true + /unbzip2-stream/1.4.3: + resolution: {integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==} + dependencies: + buffer: 5.7.1 + through: 2.3.8 + dev: true + /unc-path-regex/0.1.2: resolution: {integrity: sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==} engines: {node: '>=0.10.0'} @@ -9328,6 +9486,13 @@ packages: yargs-parser: 21.1.1 dev: true + /yauzl/2.10.0: + resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==} + dependencies: + buffer-crc32: 0.2.13 + fd-slicer: 1.1.0 + dev: true + /yn/3.1.1: resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==} engines: {node: '>=6'} diff --git a/setup-puppeteer.ts b/setup-puppeteer.ts new file mode 100644 index 00000000000..6c7ac4a5c3e --- /dev/null +++ b/setup-puppeteer.ts @@ -0,0 +1,12 @@ +import type { Browser } from 'puppeteer'; +import puppeteer from 'puppeteer'; + +let browser: Browser; + +beforeAll(async () => { + browser = await puppeteer.launch(); +}); + +afterAll(async () => { + await browser.close(); +}); From 35faf15fd0a83c3e5a67f65461f067a50e8d23f5 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Tue, 31 Jan 2023 15:17:35 +0530 Subject: [PATCH 13/47] use pupeteer for all browser tests, remove jsdom --- .github/workflows/browser-e2e-test.yaml | 2 +- .github/workflows/browser-unit-test.yaml | 2 +- package.json | 1 - pnpm-lock.yaml | 304 ----------------------- 4 files changed, 2 insertions(+), 307 deletions(-) diff --git a/.github/workflows/browser-e2e-test.yaml b/.github/workflows/browser-e2e-test.yaml index 13a7b1a87fe..a66eb2219e6 100644 --- a/.github/workflows/browser-e2e-test.yaml +++ b/.github/workflows/browser-e2e-test.yaml @@ -32,7 +32,7 @@ jobs: run: pnpm services:run - name: Browser e2e tests - run: pnpm test -- --group=common/e2e --env=jsdom + run: pnpm test -- --group=common/e2e --setupFilesAfterEnv=./setup-puppeteer.ts --testTimeout=30000 - name: Stop services run: pnpm services:clean diff --git a/.github/workflows/browser-unit-test.yaml b/.github/workflows/browser-unit-test.yaml index 5b079a42e11..9d79c255dd6 100644 --- a/.github/workflows/browser-unit-test.yaml +++ b/.github/workflows/browser-unit-test.yaml @@ -29,4 +29,4 @@ jobs: id: findPr - name: Browser unit tests - run: pnpm test -- --group=common/unit --setupFilesAfterEnv=./setup-puppeteer.ts + run: pnpm test -- --group=common/unit --setupFilesAfterEnv=./setup-puppeteer.ts --testTimeout=30000 diff --git a/package.json b/package.json index e4479cf8cce..3585e7094ad 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,6 @@ "ethers": "^5.7.2", "forc-bin": "workspace:*", "jest": "^29.3.1", - "jest-environment-jsdom": "^29.3.1", "jest-runner-groups": "^2.2.0", "jest-text-transformer": "^1.0.4", "markdownlint": "^0.23.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2e1256e3add..4481969f519 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -32,7 +32,6 @@ importers: ethers: ^5.7.2 forc-bin: workspace:* jest: ^29.3.1 - jest-environment-jsdom: ^29.3.1 jest-runner-groups: ^2.2.0 jest-text-transformer: ^1.0.4 markdownlint: ^0.23.1 @@ -82,7 +81,6 @@ importers: ethers: 5.7.2 forc-bin: link:packages/forc-bin jest: 29.3.1_t5wpzltkkzdw6ng6jmtbqvsf2q - jest-environment-jsdom: 29.3.1 jest-runner-groups: 2.2.0_qrt5due4lpwhtnujr3g74bqrki jest-text-transformer: 1.0.4 markdownlint: 0.23.1 @@ -2989,14 +2987,6 @@ packages: resolution: {integrity: sha512-FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA==} dev: true - /@types/jsdom/20.0.1: - resolution: {integrity: sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==} - dependencies: - '@types/node': 18.11.9 - '@types/tough-cookie': 4.0.2 - parse5: 7.1.2 - dev: true - /@types/json-schema/7.0.11: resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==} dev: true @@ -3113,10 +3103,6 @@ packages: resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==} dev: true - /@types/tough-cookie/4.0.2: - resolution: {integrity: sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==} - dev: true - /@types/web/0.0.65: resolution: {integrity: sha512-dl7VRSYBhxhOVxHA/ec8e7EzGXSQJrrGvRgLQWxusaJk1oT4I9nLpWiqsxekYI2eAEuet05toEm+rByL0G8x2Q==} dev: true @@ -3320,10 +3306,6 @@ packages: - encoding dev: true - /abab/2.0.6: - resolution: {integrity: sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==} - dev: true - /abort-controller/3.0.0: resolution: {integrity: sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==} engines: {node: '>=6.5'} @@ -3331,13 +3313,6 @@ packages: event-target-shim: 5.0.1 dev: true - /acorn-globals/7.0.1: - resolution: {integrity: sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==} - dependencies: - acorn: 8.8.1 - acorn-walk: 8.2.0 - dev: true - /acorn-jsx/5.3.2_acorn@8.8.1: resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} peerDependencies: @@ -4208,21 +4183,6 @@ packages: which: 2.0.2 dev: true - /cssom/0.3.8: - resolution: {integrity: sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==} - dev: true - - /cssom/0.5.0: - resolution: {integrity: sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==} - dev: true - - /cssstyle/2.3.0: - resolution: {integrity: sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==} - engines: {node: '>=8'} - dependencies: - cssom: 0.3.8 - dev: true - /csv-generate/3.4.3: resolution: {integrity: sha512-w/T+rqR0vwvHqWs/1ZyMDWtHHSJaN06klRqJXBEpDJaM/+dZkso0OKh1VcuuYvK3XM53KysVNq8Ko/epCK8wOw==} dev: true @@ -4249,15 +4209,6 @@ packages: resolution: {integrity: sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==} dev: true - /data-urls/3.0.2: - resolution: {integrity: sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==} - engines: {node: '>=12'} - dependencies: - abab: 2.0.6 - whatwg-mimetype: 3.0.0 - whatwg-url: 11.0.0 - dev: true - /dataloader/1.4.0: resolution: {integrity: sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==} dev: true @@ -4317,10 +4268,6 @@ packages: engines: {node: '>=0.10.0'} dev: true - /decimal.js/10.4.3: - resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==} - dev: true - /dedent/0.7.0: resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==} dev: true @@ -4412,13 +4359,6 @@ packages: esutils: 2.0.3 dev: true - /domexception/4.0.0: - resolution: {integrity: sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==} - engines: {node: '>=12'} - dependencies: - webidl-conversions: 7.0.0 - dev: true - /dot-case/3.0.4: resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==} dependencies: @@ -4504,11 +4444,6 @@ packages: resolution: {integrity: sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==} dev: true - /entities/4.4.0: - resolution: {integrity: sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==} - engines: {node: '>=0.12'} - dev: true - /error-ex/1.3.2: resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==} dependencies: @@ -4789,19 +4724,6 @@ packages: engines: {node: '>=10'} dev: true - /escodegen/2.0.0: - resolution: {integrity: sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==} - engines: {node: '>=6.0'} - hasBin: true - dependencies: - esprima: 4.0.1 - estraverse: 5.3.0 - esutils: 2.0.3 - optionator: 0.8.3 - optionalDependencies: - source-map: 0.6.1 - dev: true - /eslint-config-airbnb-base/15.0.0_ktrec6dplf4now6nlbc6d67jee: resolution: {integrity: sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==} engines: {node: ^10.12.0 || >=12.0.0} @@ -5397,15 +5319,6 @@ packages: combined-stream: 1.0.8 mime-types: 2.1.35 - /form-data/4.0.0: - resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==} - engines: {node: '>= 6'} - dependencies: - asynckit: 0.4.0 - combined-stream: 1.0.8 - mime-types: 2.1.35 - dev: true - /formdata-node/4.4.1: resolution: {integrity: sha512-0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ==} engines: {node: '>= 12.20'} @@ -5763,13 +5676,6 @@ packages: resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==} dev: true - /html-encoding-sniffer/3.0.0: - resolution: {integrity: sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==} - engines: {node: '>=12'} - dependencies: - whatwg-encoding: 2.0.0 - dev: true - /html-escaper/2.0.2: resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==} dev: true @@ -5811,13 +5717,6 @@ packages: safer-buffer: 2.1.2 dev: true - /iconv-lite/0.6.3: - resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==} - engines: {node: '>=0.10.0'} - dependencies: - safer-buffer: 2.1.2 - dev: true - /ieee754/1.2.1: resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==} dev: true @@ -6050,10 +5949,6 @@ packages: engines: {node: '>=0.10.0'} dev: true - /is-potential-custom-element-name/1.0.1: - resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==} - dev: true - /is-regex/1.1.4: resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==} engines: {node: '>= 0.4'} @@ -6379,29 +6274,6 @@ packages: pretty-format: 29.3.1 dev: true - /jest-environment-jsdom/29.3.1: - resolution: {integrity: sha512-G46nKgiez2Gy4zvYNhayfMEAFlVHhWfncqvqS6yCd0i+a4NsSUD2WtrKSaYQrYiLQaupHXxCRi8xxVL2M9PbhA==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - peerDependencies: - canvas: ^2.5.0 - peerDependenciesMeta: - canvas: - optional: true - dependencies: - '@jest/environment': 29.3.1 - '@jest/fake-timers': 29.3.1 - '@jest/types': 29.3.1 - '@types/jsdom': 20.0.1 - '@types/node': 18.11.9 - jest-mock: 29.3.1 - jest-util: 29.3.1 - jsdom: 20.0.3 - transitivePeerDependencies: - - bufferutil - - supports-color - - utf-8-validate - dev: true - /jest-environment-node/29.3.1: resolution: {integrity: sha512-xm2THL18Xf5sIHoU7OThBPtuH6Lerd+Y1NLYiZJlkE3hbE+7N7r8uvHIl/FkZ5ymKXJe/11SQuf3fv4v6rUMag==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} @@ -6739,47 +6611,6 @@ packages: engines: {node: '>=12.0.0'} dev: true - /jsdom/20.0.3: - resolution: {integrity: sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==} - engines: {node: '>=14'} - peerDependencies: - canvas: ^2.5.0 - peerDependenciesMeta: - canvas: - optional: true - dependencies: - abab: 2.0.6 - acorn: 8.8.1 - acorn-globals: 7.0.1 - cssom: 0.5.0 - cssstyle: 2.3.0 - data-urls: 3.0.2 - decimal.js: 10.4.3 - domexception: 4.0.0 - escodegen: 2.0.0 - form-data: 4.0.0 - html-encoding-sniffer: 3.0.0 - http-proxy-agent: 5.0.0 - https-proxy-agent: 5.0.1 - is-potential-custom-element-name: 1.0.1 - nwsapi: 2.2.2 - parse5: 7.1.2 - saxes: 6.0.0 - symbol-tree: 3.2.4 - tough-cookie: 4.1.2 - w3c-xmlserializer: 4.0.0 - webidl-conversions: 7.0.0 - whatwg-encoding: 2.0.0 - whatwg-mimetype: 3.0.0 - whatwg-url: 11.0.0 - ws: 8.11.0 - xml-name-validator: 4.0.0 - transitivePeerDependencies: - - bufferutil - - supports-color - - utf-8-validate - dev: true - /jsesc/2.5.2: resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==} engines: {node: '>=4'} @@ -6916,14 +6747,6 @@ packages: engines: {node: '>=6'} dev: true - /levn/0.3.0: - resolution: {integrity: sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==} - engines: {node: '>= 0.8.0'} - dependencies: - prelude-ls: 1.1.2 - type-check: 0.3.2 - dev: true - /levn/0.4.1: resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} engines: {node: '>= 0.8.0'} @@ -7460,10 +7283,6 @@ packages: resolution: {integrity: sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==} dev: true - /nwsapi/2.2.2: - resolution: {integrity: sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==} - dev: true - /object-assign/4.1.1: resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} engines: {node: '>=0.10.0'} @@ -7543,18 +7362,6 @@ packages: is-wsl: 2.2.0 dev: true - /optionator/0.8.3: - resolution: {integrity: sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==} - engines: {node: '>= 0.8.0'} - dependencies: - deep-is: 0.1.4 - fast-levenshtein: 2.0.6 - levn: 0.3.0 - prelude-ls: 1.1.2 - type-check: 0.3.2 - word-wrap: 1.2.3 - dev: true - /optionator/0.9.1: resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==} engines: {node: '>= 0.8.0'} @@ -7684,12 +7491,6 @@ packages: lines-and-columns: 1.2.4 dev: true - /parse5/7.1.2: - resolution: {integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==} - dependencies: - entities: 4.4.0 - dev: true - /pascal-case/3.1.2: resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==} dependencies: @@ -7818,11 +7619,6 @@ packages: which-pm: 2.0.0 dev: true - /prelude-ls/1.1.2: - resolution: {integrity: sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==} - engines: {node: '>= 0.8.0'} - dev: true - /prelude-ls/1.2.1: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} @@ -7885,10 +7681,6 @@ packages: resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==} dev: true - /psl/1.9.0: - resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==} - dev: true - /pump/3.0.0: resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==} dependencies: @@ -7955,10 +7747,6 @@ packages: engines: {node: '>=0.6.0', teleport: '>=0.2.0'} dev: true - /querystringify/2.2.0: - resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==} - dev: true - /queue-microtask/1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} dev: true @@ -8108,10 +7896,6 @@ packages: resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==} dev: true - /requires-port/1.0.0: - resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==} - dev: true - /resolve-cwd/3.0.0: resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==} engines: {node: '>=8'} @@ -8222,13 +8006,6 @@ packages: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} dev: true - /saxes/6.0.0: - resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==} - engines: {node: '>=v12.22.7'} - dependencies: - xmlchars: 2.2.0 - dev: true - /scrypt-js/3.0.1: resolution: {integrity: sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==} dev: true @@ -8600,10 +8377,6 @@ packages: tslib: 2.4.1 dev: true - /symbol-tree/3.2.4: - resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==} - dev: true - /tar-fs/2.1.1: resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==} dependencies: @@ -8688,16 +8461,6 @@ packages: is-number: 7.0.0 dev: true - /tough-cookie/4.1.2: - resolution: {integrity: sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==} - engines: {node: '>=6'} - dependencies: - psl: 1.9.0 - punycode: 2.1.1 - universalify: 0.2.0 - url-parse: 1.5.10 - dev: true - /tr46/0.0.3: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} @@ -8707,13 +8470,6 @@ packages: punycode: 2.1.1 dev: true - /tr46/3.0.0: - resolution: {integrity: sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==} - engines: {node: '>=12'} - dependencies: - punycode: 2.1.1 - dev: true - /tree-kill/1.2.2: resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} hasBin: true @@ -8985,13 +8741,6 @@ packages: turbo-windows-arm64: 1.6.3 dev: true - /type-check/0.3.2: - resolution: {integrity: sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==} - engines: {node: '>= 0.8.0'} - dependencies: - prelude-ls: 1.1.2 - dev: true - /type-check/0.4.0: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} engines: {node: '>= 0.8.0'} @@ -9129,11 +8878,6 @@ packages: engines: {node: '>= 4.0.0'} dev: true - /universalify/0.2.0: - resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==} - engines: {node: '>= 4.0.0'} - dev: true - /unixify/1.0.0: resolution: {integrity: sha512-6bc58dPYhCMHHuwxldQxO3RRNZ4eCogZ/st++0+fcC1nr0jiGUtAdBJ2qzmLQWSxbtz42pWt4QQMiZ9HvZf5cg==} engines: {node: '>=0.10.0'} @@ -9170,13 +8914,6 @@ packages: punycode: 2.1.1 dev: true - /url-parse/1.5.10: - resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==} - dependencies: - querystringify: 2.2.0 - requires-port: 1.0.0 - dev: true - /util-deprecate/1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} dev: true @@ -9220,13 +8957,6 @@ packages: resolution: {integrity: sha512-gu73tuZfJgu+mvCSy4UZwd2JXykjK9zAZsfmDeut5dx/1a7FeTk0XwJsSuqQn+cuMCGVbIBfl+s53X4T19DnzQ==} dev: true - /w3c-xmlserializer/4.0.0: - resolution: {integrity: sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==} - engines: {node: '>=14'} - dependencies: - xml-name-validator: 4.0.0 - dev: true - /walker/1.0.8: resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==} dependencies: @@ -9266,35 +8996,10 @@ packages: resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==} dev: true - /webidl-conversions/7.0.0: - resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==} - engines: {node: '>=12'} - dev: true - - /whatwg-encoding/2.0.0: - resolution: {integrity: sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==} - engines: {node: '>=12'} - dependencies: - iconv-lite: 0.6.3 - dev: true - /whatwg-fetch/3.6.2: resolution: {integrity: sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==} dev: true - /whatwg-mimetype/3.0.0: - resolution: {integrity: sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==} - engines: {node: '>=12'} - dev: true - - /whatwg-url/11.0.0: - resolution: {integrity: sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==} - engines: {node: '>=12'} - dependencies: - tr46: 3.0.0 - webidl-conversions: 7.0.0 - dev: true - /whatwg-url/5.0.0: resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==} dependencies: @@ -9409,15 +9114,6 @@ packages: optional: true dev: true - /xml-name-validator/4.0.0: - resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==} - engines: {node: '>=12'} - dev: true - - /xmlchars/2.2.0: - resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==} - dev: true - /y18n/4.0.3: resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==} dev: true From 7677df5302546e26b8fddc4791c9f4445b649b73 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Tue, 31 Jan 2023 15:33:16 +0530 Subject: [PATCH 14/47] delete old test workflow, move lint checks --- .github/workflows/browser-e2e-test.yaml | 4 -- .github/workflows/browser-unit-test.yaml | 4 -- .github/workflows/node-e2e-test.yaml | 4 -- .github/workflows/node-unit-test.yaml | 4 -- .github/workflows/pr-lint.yaml | 12 ++++-- .github/workflows/test.yaml | 51 ------------------------ 6 files changed, 9 insertions(+), 70 deletions(-) delete mode 100644 .github/workflows/test.yaml diff --git a/.github/workflows/browser-e2e-test.yaml b/.github/workflows/browser-e2e-test.yaml index a66eb2219e6..ccfbfb2db54 100644 --- a/.github/workflows/browser-e2e-test.yaml +++ b/.github/workflows/browser-e2e-test.yaml @@ -24,10 +24,6 @@ jobs: run: | BUILD_VERSION="0.0.0-${{ github.ref_name }}-$(git rev-parse --short $GITHUB_SHA)" pnpm build - - name: Checking PR Number - uses: jwalton/gh-find-current-pr@v1 - id: findPr - - name: Run services run: pnpm services:run diff --git a/.github/workflows/browser-unit-test.yaml b/.github/workflows/browser-unit-test.yaml index 9d79c255dd6..d8b3c9d9288 100644 --- a/.github/workflows/browser-unit-test.yaml +++ b/.github/workflows/browser-unit-test.yaml @@ -24,9 +24,5 @@ jobs: run: | BUILD_VERSION="0.0.0-${{ github.ref_name }}-$(git rev-parse --short $GITHUB_SHA)" pnpm build - - name: Checking PR Number - uses: jwalton/gh-find-current-pr@v1 - id: findPr - - name: Browser unit tests run: pnpm test -- --group=common/unit --setupFilesAfterEnv=./setup-puppeteer.ts --testTimeout=30000 diff --git a/.github/workflows/node-e2e-test.yaml b/.github/workflows/node-e2e-test.yaml index ef4875a4f55..13f997ba5db 100644 --- a/.github/workflows/node-e2e-test.yaml +++ b/.github/workflows/node-e2e-test.yaml @@ -24,10 +24,6 @@ jobs: run: | BUILD_VERSION="0.0.0-${{ github.ref_name }}-$(git rev-parse --short $GITHUB_SHA)" pnpm build - - name: Checking PR Number - uses: jwalton/gh-find-current-pr@v1 - id: findPr - - name: Run services run: pnpm services:run diff --git a/.github/workflows/node-unit-test.yaml b/.github/workflows/node-unit-test.yaml index 86eddef2c9b..ab6826f49e5 100644 --- a/.github/workflows/node-unit-test.yaml +++ b/.github/workflows/node-unit-test.yaml @@ -24,9 +24,5 @@ jobs: run: | BUILD_VERSION="0.0.0-${{ github.ref_name }}-$(git rev-parse --short $GITHUB_SHA)" pnpm build - - name: Checking PR Number - uses: jwalton/gh-find-current-pr@v1 - id: findPr - - name: Node unit tests run: pnpm test -- --group=node/unit --group=common/unit diff --git a/.github/workflows/pr-lint.yaml b/.github/workflows/pr-lint.yaml index 6978cf6b1f2..aae80977e0f 100644 --- a/.github/workflows/pr-lint.yaml +++ b/.github/workflows/pr-lint.yaml @@ -20,9 +20,8 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - validate-changeset: - name: Validate PR Changeset - if: github.head_ref != 'changeset-release/master' + lint: + name: Lint runs-on: ubuntu-latest steps: - name: Checkout @@ -33,5 +32,12 @@ jobs: - name: CI Setup uses: ./.github/actions/ci-setup + - name: Forc Format Check + run: pnpm forc:check + + - name: Lint + run: pnpm lint + - name: Validate Changeset + if: github.head_ref != 'changeset-release/master' run: pnpm changeset status --since=origin/master diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml deleted file mode 100644 index 4055b1b0d9f..00000000000 --- a/.github/workflows/test.yaml +++ /dev/null @@ -1,51 +0,0 @@ -name: "Test" - -on: - pull_request: - push: - branches: - - master - -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -jobs: - test: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: CI Setup - uses: ./.github/actions/ci-setup - - - name: Forc Format Check - run: pnpm forc:check - - - name: Build - run: | - BUILD_VERSION="0.0.0-${{ github.ref_name }}-$(git rev-parse --short $GITHUB_SHA)" pnpm build - - - name: Lint - run: | - pnpm lint - - - name: Checking PR Number - uses: jwalton/gh-find-current-pr@v1 - id: findPr - - - name: Run tests and publish coverage - uses: ArtiomTr/jest-coverage-report-action@v2 - if: ${{ steps.findPr.outputs.number }} - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - package-manager: pnpm - annotations: failed-tests - test-script: pnpm ci:test - prnumber: ${{ steps.findPr.outputs.number }} - - - name: Run tests no coverage publishing - if: ${{ !steps.findPr.outputs.number }} - run: | - pnpm ci:test From 79b3bb07497e9bab94191b3aeb99356992f2ff9c Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Tue, 31 Jan 2023 15:35:46 +0530 Subject: [PATCH 15/47] add build step to lint action --- .github/workflows/pr-lint.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/pr-lint.yaml b/.github/workflows/pr-lint.yaml index aae80977e0f..91cd82fe25d 100644 --- a/.github/workflows/pr-lint.yaml +++ b/.github/workflows/pr-lint.yaml @@ -32,6 +32,10 @@ jobs: - name: CI Setup uses: ./.github/actions/ci-setup + - name: Build + run: | + BUILD_VERSION="0.0.0-${{ github.ref_name }}-$(git rev-parse --short $GITHUB_SHA)" pnpm build + - name: Forc Format Check run: pnpm forc:check From 1aa45ce54f36e86c29f774ba7f420b607b5fd008 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Tue, 31 Jan 2023 16:25:51 +0530 Subject: [PATCH 16/47] run e2e tests sequentially --- .github/workflows/browser-e2e-test.yaml | 2 +- .github/workflows/node-e2e-test.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/browser-e2e-test.yaml b/.github/workflows/browser-e2e-test.yaml index ccfbfb2db54..4a3b2a9601f 100644 --- a/.github/workflows/browser-e2e-test.yaml +++ b/.github/workflows/browser-e2e-test.yaml @@ -28,7 +28,7 @@ jobs: run: pnpm services:run - name: Browser e2e tests - run: pnpm test -- --group=common/e2e --setupFilesAfterEnv=./setup-puppeteer.ts --testTimeout=30000 + run: pnpm test -- --runInBand --group=common/e2e --setupFilesAfterEnv=./setup-puppeteer.ts --testTimeout=30000 - name: Stop services run: pnpm services:clean diff --git a/.github/workflows/node-e2e-test.yaml b/.github/workflows/node-e2e-test.yaml index 13f997ba5db..3b910a1db67 100644 --- a/.github/workflows/node-e2e-test.yaml +++ b/.github/workflows/node-e2e-test.yaml @@ -28,7 +28,7 @@ jobs: run: pnpm services:run - name: Node e2e tests - run: pnpm test -- --group=node/e2e --group=common/e2e + run: pnpm test -- --runInBand --group=node/e2e --group=common/e2e - name: Stop services run: pnpm services:clean From a49de063ddec54a4c86b449cea9a445f9c8b4843 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Sat, 25 Feb 2023 00:53:37 +0700 Subject: [PATCH 17/47] add label to `account.test.ts` --- packages/wallet/src/account.test.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/wallet/src/account.test.ts b/packages/wallet/src/account.test.ts index f868885979e..45e7695c72f 100644 --- a/packages/wallet/src/account.test.ts +++ b/packages/wallet/src/account.test.ts @@ -19,6 +19,9 @@ import { Account } from './account'; afterEach(jest.restoreAllMocks); +/* + * @group common/e2e + */ describe('Account', () => { const assets = [ '0x0101010101010101010101010101010101010101010101010101010101010101', From c3338b605359a107ec6777c3fc9724d4a5471ce5 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Sat, 25 Feb 2023 02:03:59 +0700 Subject: [PATCH 18/47] try merging coverage reports using gh artifacts --- .github/workflows/browser-e2e-test.yaml | 10 +++++++-- .github/workflows/browser-unit-test.yaml | 8 +++++++- .github/workflows/merge-coverage.yaml | 26 ++++++++++++++++++++++++ .github/workflows/node-e2e-test.yaml | 8 +++++++- .github/workflows/node-unit-test.yaml | 8 +++++++- 5 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/merge-coverage.yaml diff --git a/.github/workflows/browser-e2e-test.yaml b/.github/workflows/browser-e2e-test.yaml index 4a3b2a9601f..06e671735f0 100644 --- a/.github/workflows/browser-e2e-test.yaml +++ b/.github/workflows/browser-e2e-test.yaml @@ -11,7 +11,7 @@ concurrency: cancel-in-progress: true jobs: - test: + browser-test: runs-on: ubuntu-latest steps: - name: Checkout @@ -28,7 +28,13 @@ jobs: run: pnpm services:run - name: Browser e2e tests - run: pnpm test -- --runInBand --group=common/e2e --setupFilesAfterEnv=./setup-puppeteer.ts --testTimeout=30000 + run: pnpm test -- --group=common/e2e --setupFilesAfterEnv=./setup-puppeteer.ts --testTimeout=30000 --coverage + + - name: Upload coverage to Github artifacts + uses: actions/upload-artifact@v2 + with: + name: browser-e2e-coverage-${{ github.run_id }} + path: coverage - name: Stop services run: pnpm services:clean diff --git a/.github/workflows/browser-unit-test.yaml b/.github/workflows/browser-unit-test.yaml index d8b3c9d9288..30a09dc4adf 100644 --- a/.github/workflows/browser-unit-test.yaml +++ b/.github/workflows/browser-unit-test.yaml @@ -25,4 +25,10 @@ jobs: BUILD_VERSION="0.0.0-${{ github.ref_name }}-$(git rev-parse --short $GITHUB_SHA)" pnpm build - name: Browser unit tests - run: pnpm test -- --group=common/unit --setupFilesAfterEnv=./setup-puppeteer.ts --testTimeout=30000 + run: pnpm test -- --group=common/unit --setupFilesAfterEnv=./setup-puppeteer.ts --testTimeout=30000 --coverage + + - name: Upload coverage to Github artifacts + uses: actions/upload-artifact@v2 + with: + name: browser-unit-coverage-${{ github.run_id }} + path: coverage diff --git a/.github/workflows/merge-coverage.yaml b/.github/workflows/merge-coverage.yaml new file mode 100644 index 00000000000..1d9295d22e5 --- /dev/null +++ b/.github/workflows/merge-coverage.yaml @@ -0,0 +1,26 @@ +name: "Test coverage" + +on: + workflow_run: + workflows: + [ + "Browser e2e tests", + "Browser unit tests", + "Node e2e tests", + "Node unit tests", + ] + types: + - completed + +jobs: + collect-coverage: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Download all workflow run artifacts + uses: actions/download-artifact@v3 + + - name: Log all downloaded artifacts + run: ls -R diff --git a/.github/workflows/node-e2e-test.yaml b/.github/workflows/node-e2e-test.yaml index 3b910a1db67..6bb2b915a86 100644 --- a/.github/workflows/node-e2e-test.yaml +++ b/.github/workflows/node-e2e-test.yaml @@ -28,7 +28,13 @@ jobs: run: pnpm services:run - name: Node e2e tests - run: pnpm test -- --runInBand --group=node/e2e --group=common/e2e + run: pnpm test -- --group=node/e2e --group=common/e2e --coverage + + - name: Upload coverage to Github artifacts + uses: actions/upload-artifact@v2 + with: + name: node-e2e-coverage-${{ github.run_id }} + path: coverage - name: Stop services run: pnpm services:clean diff --git a/.github/workflows/node-unit-test.yaml b/.github/workflows/node-unit-test.yaml index ab6826f49e5..76e589c3bc3 100644 --- a/.github/workflows/node-unit-test.yaml +++ b/.github/workflows/node-unit-test.yaml @@ -25,4 +25,10 @@ jobs: BUILD_VERSION="0.0.0-${{ github.ref_name }}-$(git rev-parse --short $GITHUB_SHA)" pnpm build - name: Node unit tests - run: pnpm test -- --group=node/unit --group=common/unit + run: pnpm test -- --group=node/unit --group=common/unit --coverage + + - name: Upload coverage to Github artifacts + uses: actions/upload-artifact@v2 + with: + name: node-unit-coverage-${{ github.run_id }} + path: coverage From 05d748bce351936d19b4de61f5c32f6ed4a91d6d Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Sat, 25 Feb 2023 02:14:10 +0700 Subject: [PATCH 19/47] temp remove node e2e tests from reqd list bc theyre failing --- .github/workflows/merge-coverage.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/merge-coverage.yaml b/.github/workflows/merge-coverage.yaml index 1d9295d22e5..c9fd6e050e7 100644 --- a/.github/workflows/merge-coverage.yaml +++ b/.github/workflows/merge-coverage.yaml @@ -2,13 +2,7 @@ name: "Test coverage" on: workflow_run: - workflows: - [ - "Browser e2e tests", - "Browser unit tests", - "Node e2e tests", - "Node unit tests", - ] + workflows: ["Browser e2e tests", "Browser unit tests", "Node unit tests"] types: - completed From 75665c1db77f5ec766fa32b5ef7d39b2f2d6f6b1 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Sat, 25 Feb 2023 02:24:12 +0700 Subject: [PATCH 20/47] Update merge-coverage.yaml --- .github/workflows/merge-coverage.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/merge-coverage.yaml b/.github/workflows/merge-coverage.yaml index c9fd6e050e7..50d1c7d03d6 100644 --- a/.github/workflows/merge-coverage.yaml +++ b/.github/workflows/merge-coverage.yaml @@ -1,6 +1,10 @@ name: "Test coverage" on: + pull_request: + push: + branches: + - master workflow_run: workflows: ["Browser e2e tests", "Browser unit tests", "Node unit tests"] types: From ca111240e6051eb67f8389d99aa91e749a467a79 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Sat, 25 Feb 2023 02:33:01 +0700 Subject: [PATCH 21/47] Update merge-coverage.yaml --- .github/workflows/merge-coverage.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/merge-coverage.yaml b/.github/workflows/merge-coverage.yaml index 50d1c7d03d6..c9fd6e050e7 100644 --- a/.github/workflows/merge-coverage.yaml +++ b/.github/workflows/merge-coverage.yaml @@ -1,10 +1,6 @@ name: "Test coverage" on: - pull_request: - push: - branches: - - master workflow_run: workflows: ["Browser e2e tests", "Browser unit tests", "Node unit tests"] types: From 1b1e7e217d5b3ac5bff241b8a252e9dea6379ee1 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Sat, 25 Feb 2023 12:50:52 +0700 Subject: [PATCH 22/47] rename workflows --- .../workflows/{browser-e2e-test.yaml => browser-e2e-tests.yaml} | 2 +- .../{browser-unit-test.yaml => browser-unit-tests.yaml} | 2 +- .github/workflows/{node-e2e-test.yaml => node-e2e-tests.yaml} | 2 +- .github/workflows/{node-unit-test.yaml => node-unit-tests.yaml} | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename .github/workflows/{browser-e2e-test.yaml => browser-e2e-tests.yaml} (97%) rename .github/workflows/{browser-unit-test.yaml => browser-unit-tests.yaml} (97%) rename .github/workflows/{node-e2e-test.yaml => node-e2e-tests.yaml} (98%) rename .github/workflows/{node-unit-test.yaml => node-unit-tests.yaml} (97%) diff --git a/.github/workflows/browser-e2e-test.yaml b/.github/workflows/browser-e2e-tests.yaml similarity index 97% rename from .github/workflows/browser-e2e-test.yaml rename to .github/workflows/browser-e2e-tests.yaml index 06e671735f0..c58f7c93224 100644 --- a/.github/workflows/browser-e2e-test.yaml +++ b/.github/workflows/browser-e2e-tests.yaml @@ -11,7 +11,7 @@ concurrency: cancel-in-progress: true jobs: - browser-test: + browser-e2e-tests: runs-on: ubuntu-latest steps: - name: Checkout diff --git a/.github/workflows/browser-unit-test.yaml b/.github/workflows/browser-unit-tests.yaml similarity index 97% rename from .github/workflows/browser-unit-test.yaml rename to .github/workflows/browser-unit-tests.yaml index 30a09dc4adf..7ce03c3ee47 100644 --- a/.github/workflows/browser-unit-test.yaml +++ b/.github/workflows/browser-unit-tests.yaml @@ -11,7 +11,7 @@ concurrency: cancel-in-progress: true jobs: - test: + browser-unit-tests: runs-on: ubuntu-latest steps: - name: Checkout diff --git a/.github/workflows/node-e2e-test.yaml b/.github/workflows/node-e2e-tests.yaml similarity index 98% rename from .github/workflows/node-e2e-test.yaml rename to .github/workflows/node-e2e-tests.yaml index 6bb2b915a86..5325714a9d6 100644 --- a/.github/workflows/node-e2e-test.yaml +++ b/.github/workflows/node-e2e-tests.yaml @@ -11,7 +11,7 @@ concurrency: cancel-in-progress: true jobs: - test: + node-e2e-tests: runs-on: ubuntu-latest steps: - name: Checkout diff --git a/.github/workflows/node-unit-test.yaml b/.github/workflows/node-unit-tests.yaml similarity index 97% rename from .github/workflows/node-unit-test.yaml rename to .github/workflows/node-unit-tests.yaml index 76e589c3bc3..56b9ef903e2 100644 --- a/.github/workflows/node-unit-test.yaml +++ b/.github/workflows/node-unit-tests.yaml @@ -11,7 +11,7 @@ concurrency: cancel-in-progress: true jobs: - test: + node-unit-tests: runs-on: ubuntu-latest steps: - name: Checkout From 6e9f2891c60fec894b392320f9abed6bdc4e6a52 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Sat, 25 Feb 2023 12:57:13 +0700 Subject: [PATCH 23/47] Update merge-coverage.yaml --- .github/workflows/merge-coverage.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/merge-coverage.yaml b/.github/workflows/merge-coverage.yaml index c9fd6e050e7..81a180db392 100644 --- a/.github/workflows/merge-coverage.yaml +++ b/.github/workflows/merge-coverage.yaml @@ -1,14 +1,17 @@ name: "Test coverage" on: - workflow_run: - workflows: ["Browser e2e tests", "Browser unit tests", "Node unit tests"] - types: - - completed + pull_request: + push: + branches: + - master jobs: collect-coverage: runs-on: ubuntu-latest + needs: + [browser-e2e-tests, browser-unit-tests, node-e2e-tests, node-unit-tests] + if: always() steps: - name: Checkout uses: actions/checkout@v3 From b49503de0917c5480c3a7d263dafa5eea7dd17c3 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Sat, 25 Feb 2023 13:11:09 +0700 Subject: [PATCH 24/47] update logic --- .github/workflows/browser-e2e-tests.yaml | 2 ++ .github/workflows/browser-unit-tests.yaml | 2 ++ .github/workflows/merge-coverage.yaml | 22 ++++++++++++++++------ .github/workflows/node-e2e-tests.yaml | 2 ++ .github/workflows/node-unit-tests.yaml | 2 ++ 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.github/workflows/browser-e2e-tests.yaml b/.github/workflows/browser-e2e-tests.yaml index c58f7c93224..e2d91e8bbaf 100644 --- a/.github/workflows/browser-e2e-tests.yaml +++ b/.github/workflows/browser-e2e-tests.yaml @@ -13,6 +13,8 @@ concurrency: jobs: browser-e2e-tests: runs-on: ubuntu-latest + outputs: + status: ${{ job.status }} steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/browser-unit-tests.yaml b/.github/workflows/browser-unit-tests.yaml index 7ce03c3ee47..8b355a303a9 100644 --- a/.github/workflows/browser-unit-tests.yaml +++ b/.github/workflows/browser-unit-tests.yaml @@ -13,6 +13,8 @@ concurrency: jobs: browser-unit-tests: runs-on: ubuntu-latest + outputs: + status: ${{ job.status }} steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/merge-coverage.yaml b/.github/workflows/merge-coverage.yaml index 81a180db392..710ddf20bcc 100644 --- a/.github/workflows/merge-coverage.yaml +++ b/.github/workflows/merge-coverage.yaml @@ -1,17 +1,27 @@ name: "Test coverage" on: - pull_request: - push: - branches: - - master + workflow_run: + workflows: + [ + "node-unit-tests", + "node-e2e-tests", + "browser-unit-tests", + "browser-e2e-tests", + ] + types: + - completed jobs: collect-coverage: runs-on: ubuntu-latest needs: - [browser-e2e-tests, browser-unit-tests, node-e2e-tests, node-unit-tests] - if: always() + [ + node-unit-tests.status, + node-e2e-tests.status, + browser-unit-tests.status, + browser-e2e-tests.status, + ] steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/node-e2e-tests.yaml b/.github/workflows/node-e2e-tests.yaml index 5325714a9d6..61fe3b6d290 100644 --- a/.github/workflows/node-e2e-tests.yaml +++ b/.github/workflows/node-e2e-tests.yaml @@ -13,6 +13,8 @@ concurrency: jobs: node-e2e-tests: runs-on: ubuntu-latest + outputs: + status: ${{ job.status }} steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/node-unit-tests.yaml b/.github/workflows/node-unit-tests.yaml index 56b9ef903e2..1b44f81906b 100644 --- a/.github/workflows/node-unit-tests.yaml +++ b/.github/workflows/node-unit-tests.yaml @@ -13,6 +13,8 @@ concurrency: jobs: node-unit-tests: runs-on: ubuntu-latest + outputs: + status: ${{ job.status }} steps: - name: Checkout uses: actions/checkout@v3 From 3e0262b95acb10b1b89810e6d4214b47f4951026 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Sat, 25 Feb 2023 13:22:17 +0700 Subject: [PATCH 25/47] Update merge-coverage.yaml --- .github/workflows/merge-coverage.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/merge-coverage.yaml b/.github/workflows/merge-coverage.yaml index 710ddf20bcc..684e018e5bb 100644 --- a/.github/workflows/merge-coverage.yaml +++ b/.github/workflows/merge-coverage.yaml @@ -2,13 +2,7 @@ name: "Test coverage" on: workflow_run: - workflows: - [ - "node-unit-tests", - "node-e2e-tests", - "browser-unit-tests", - "browser-e2e-tests", - ] + workflows: ["node-unit-tests", "browser-unit-tests", "browser-e2e-tests"] types: - completed From db9e535cf192ba9f3cd2a3c587870ebb58e5a7fc Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Sun, 26 Feb 2023 01:42:48 +0700 Subject: [PATCH 26/47] Update merge-coverage.yaml --- .github/workflows/merge-coverage.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-coverage.yaml b/.github/workflows/merge-coverage.yaml index 684e018e5bb..50242e1caea 100644 --- a/.github/workflows/merge-coverage.yaml +++ b/.github/workflows/merge-coverage.yaml @@ -2,7 +2,7 @@ name: "Test coverage" on: workflow_run: - workflows: ["node-unit-tests", "browser-unit-tests", "browser-e2e-tests"] + workflows: [node-unit-tests, browser-unit-tests, browser-e2e-tests] types: - completed From a37da5d8680454befdb87d5f8d4058cb74f1b6b2 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Sun, 26 Feb 2023 01:58:18 +0700 Subject: [PATCH 27/47] Update merge-coverage.yaml --- .github/workflows/merge-coverage.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/merge-coverage.yaml b/.github/workflows/merge-coverage.yaml index 50242e1caea..7eb0b8193cd 100644 --- a/.github/workflows/merge-coverage.yaml +++ b/.github/workflows/merge-coverage.yaml @@ -2,7 +2,8 @@ name: "Test coverage" on: workflow_run: - workflows: [node-unit-tests, browser-unit-tests, browser-e2e-tests] + workflows: + [Node unit tests, Node e2e tests, Browser unit tests, Browser e2e tests] types: - completed From 3d0d4b663ad13324eeebbc63cc91cb89a0c757ef Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Mon, 27 Feb 2023 13:47:46 +0530 Subject: [PATCH 28/47] Update merge-coverage.yaml --- .github/workflows/merge-coverage.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/merge-coverage.yaml b/.github/workflows/merge-coverage.yaml index 7eb0b8193cd..28bddd82799 100644 --- a/.github/workflows/merge-coverage.yaml +++ b/.github/workflows/merge-coverage.yaml @@ -2,8 +2,7 @@ name: "Test coverage" on: workflow_run: - workflows: - [Node unit tests, Node e2e tests, Browser unit tests, Browser e2e tests] + workflows: [Node unit tests, Browser unit tests, Browser e2e tests] types: - completed From 9e434b04c64bf4ff236014fecc54cbc3f53c6978 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Mon, 27 Feb 2023 13:54:54 +0530 Subject: [PATCH 29/47] Update merge-coverage.yaml --- .github/workflows/merge-coverage.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/merge-coverage.yaml b/.github/workflows/merge-coverage.yaml index 28bddd82799..52ec7b2b76a 100644 --- a/.github/workflows/merge-coverage.yaml +++ b/.github/workflows/merge-coverage.yaml @@ -9,13 +9,13 @@ on: jobs: collect-coverage: runs-on: ubuntu-latest - needs: - [ - node-unit-tests.status, - node-e2e-tests.status, - browser-unit-tests.status, - browser-e2e-tests.status, - ] + # needs: + # [ + # node-unit-tests.status, + # node-e2e-tests.status, + # browser-unit-tests.status, + # browser-e2e-tests.status, + # ] steps: - name: Checkout uses: actions/checkout@v3 From 44d5c29bd5d557ebc9315017d407927fe30592cc Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Mon, 27 Feb 2023 18:59:23 +0530 Subject: [PATCH 30/47] update workflow files --- .github/workflows/browser-e2e-tests.yaml | 2 +- .github/workflows/browser-unit-tests.yaml | 2 +- .github/workflows/merge-coverage.yaml | 23 +++++++++++------------ .github/workflows/node-e2e-tests.yaml | 2 +- .github/workflows/node-unit-tests.yaml | 2 +- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.github/workflows/browser-e2e-tests.yaml b/.github/workflows/browser-e2e-tests.yaml index e2d91e8bbaf..619281c3320 100644 --- a/.github/workflows/browser-e2e-tests.yaml +++ b/.github/workflows/browser-e2e-tests.yaml @@ -35,7 +35,7 @@ jobs: - name: Upload coverage to Github artifacts uses: actions/upload-artifact@v2 with: - name: browser-e2e-coverage-${{ github.run_id }} + name: browser-e2e-coverage path: coverage - name: Stop services diff --git a/.github/workflows/browser-unit-tests.yaml b/.github/workflows/browser-unit-tests.yaml index 8b355a303a9..13dfd9c547f 100644 --- a/.github/workflows/browser-unit-tests.yaml +++ b/.github/workflows/browser-unit-tests.yaml @@ -32,5 +32,5 @@ jobs: - name: Upload coverage to Github artifacts uses: actions/upload-artifact@v2 with: - name: browser-unit-coverage-${{ github.run_id }} + name: browser-unit-coverage path: coverage diff --git a/.github/workflows/merge-coverage.yaml b/.github/workflows/merge-coverage.yaml index 52ec7b2b76a..3f7bcdd387b 100644 --- a/.github/workflows/merge-coverage.yaml +++ b/.github/workflows/merge-coverage.yaml @@ -2,20 +2,13 @@ name: "Test coverage" on: workflow_run: - workflows: [Node unit tests, Browser unit tests, Browser e2e tests] - types: - - completed + workflows: + [Node unit tests, Node e2e tests, Browser unit tests, Browser e2e tests] + types: [completed] jobs: collect-coverage: runs-on: ubuntu-latest - # needs: - # [ - # node-unit-tests.status, - # node-e2e-tests.status, - # browser-unit-tests.status, - # browser-e2e-tests.status, - # ] steps: - name: Checkout uses: actions/checkout@v3 @@ -23,5 +16,11 @@ jobs: - name: Download all workflow run artifacts uses: actions/download-artifact@v3 - - name: Log all downloaded artifacts - run: ls -R + - name: Merge all coverage reports + run: npx istanbul-merge --out coverage-merged.json browser-unit-coverage/coverage-final.json browser-e2e-coverage/coverage-final.json node-unit-coverage/coverage-final.json node-e2e-coverage/coverage-final.json + + - name: Upload coverage report to Codecov + uses: codecov/codecov-action@v3 + with: + files: coverage-merged.json + token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/node-e2e-tests.yaml b/.github/workflows/node-e2e-tests.yaml index 61fe3b6d290..64d11a9a642 100644 --- a/.github/workflows/node-e2e-tests.yaml +++ b/.github/workflows/node-e2e-tests.yaml @@ -35,7 +35,7 @@ jobs: - name: Upload coverage to Github artifacts uses: actions/upload-artifact@v2 with: - name: node-e2e-coverage-${{ github.run_id }} + name: node-e2e-coverage path: coverage - name: Stop services diff --git a/.github/workflows/node-unit-tests.yaml b/.github/workflows/node-unit-tests.yaml index 1b44f81906b..b92b905169f 100644 --- a/.github/workflows/node-unit-tests.yaml +++ b/.github/workflows/node-unit-tests.yaml @@ -32,5 +32,5 @@ jobs: - name: Upload coverage to Github artifacts uses: actions/upload-artifact@v2 with: - name: node-unit-coverage-${{ github.run_id }} + name: node-unit-coverage path: coverage From a60c542632c4b0343d919eea394dde73720c34b7 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Mon, 27 Feb 2023 19:06:54 +0530 Subject: [PATCH 31/47] Update merge-coverage.yaml --- .github/workflows/merge-coverage.yaml | 29 +++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge-coverage.yaml b/.github/workflows/merge-coverage.yaml index 3f7bcdd387b..cf089ccb20b 100644 --- a/.github/workflows/merge-coverage.yaml +++ b/.github/workflows/merge-coverage.yaml @@ -13,8 +13,33 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Download all workflow run artifacts - uses: actions/download-artifact@v3 + - name: Download coverage report for Browser unit tests + uses: dawidd6/action-download-artifact@v2 + with: + workflow: browser-unit-tests.yaml + name: browswer-unit-coverage + path: browser-unit-coverage + + - name: Download coverage report for Browser e2e tests + uses: dawidd6/action-download-artifact@v2 + with: + workflow: browser-e2e-tests.yaml + name: browswer-e2e-coverage + path: browser-e2e-coverage + + - name: Download coverage report for Node unit tests + uses: dawidd6/action-download-artifact@v2 + with: + workflow: node-unit-tests.yaml + name: node-unit-coverage + path: node-unit-coverage + + - name: Download coverage report for Node e2e tests + uses: dawidd6/action-download-artifact@v2 + with: + workflow: node-e2e-tests.yaml + name: node-e2e-coverage + path: node-e2e-coverage - name: Merge all coverage reports run: npx istanbul-merge --out coverage-merged.json browser-unit-coverage/coverage-final.json browser-e2e-coverage/coverage-final.json node-unit-coverage/coverage-final.json node-e2e-coverage/coverage-final.json From 3cf3d9bc42c02238205abe139f40f25f3b619b49 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Mon, 27 Feb 2023 19:25:50 +0530 Subject: [PATCH 32/47] rename workflow file --- .github/workflows/{merge-coverage.yaml => test-coverage.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{merge-coverage.yaml => test-coverage.yaml} (100%) diff --git a/.github/workflows/merge-coverage.yaml b/.github/workflows/test-coverage.yaml similarity index 100% rename from .github/workflows/merge-coverage.yaml rename to .github/workflows/test-coverage.yaml From e96513bfa1fdc2f6100d672ac27b530826ed42f7 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Mon, 27 Feb 2023 21:14:58 +0530 Subject: [PATCH 33/47] run workflows only for this pr --- .github/workflows/browser-e2e-tests.yaml | 2 + .github/workflows/browser-unit-tests.yaml | 2 + .github/workflows/node-e2e-tests.yaml | 2 + .github/workflows/node-unit-tests.yaml | 2 + .github/workflows/test.yaml | 49 +++++++++++++++++++++++ 5 files changed, 57 insertions(+) create mode 100644 .github/workflows/test.yaml diff --git a/.github/workflows/browser-e2e-tests.yaml b/.github/workflows/browser-e2e-tests.yaml index 619281c3320..f94c3c880d4 100644 --- a/.github/workflows/browser-e2e-tests.yaml +++ b/.github/workflows/browser-e2e-tests.yaml @@ -2,6 +2,8 @@ name: "Browser e2e tests" on: pull_request: + branches: + - dp/testing-groups push: branches: - master diff --git a/.github/workflows/browser-unit-tests.yaml b/.github/workflows/browser-unit-tests.yaml index 13dfd9c547f..f70d5f046ef 100644 --- a/.github/workflows/browser-unit-tests.yaml +++ b/.github/workflows/browser-unit-tests.yaml @@ -2,6 +2,8 @@ name: "Browser unit tests" on: pull_request: + branches: + - dp/testing-groups push: branches: - master diff --git a/.github/workflows/node-e2e-tests.yaml b/.github/workflows/node-e2e-tests.yaml index 64d11a9a642..35149e74916 100644 --- a/.github/workflows/node-e2e-tests.yaml +++ b/.github/workflows/node-e2e-tests.yaml @@ -2,6 +2,8 @@ name: "Node e2e tests" on: pull_request: + branches: + - dp/testing-groups push: branches: - master diff --git a/.github/workflows/node-unit-tests.yaml b/.github/workflows/node-unit-tests.yaml index b92b905169f..319ea265474 100644 --- a/.github/workflows/node-unit-tests.yaml +++ b/.github/workflows/node-unit-tests.yaml @@ -2,6 +2,8 @@ name: "Node unit tests" on: pull_request: + branches: + - dp/testing-groups push: branches: - master diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml new file mode 100644 index 00000000000..e87832b6d6f --- /dev/null +++ b/.github/workflows/test.yaml @@ -0,0 +1,49 @@ +name: "Test" + +on: + pull_request: + push: + branches: + - master + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +jobs: + test: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: CI Setup + uses: ./.github/actions/ci-setup + + - name: Forc Format Check + run: pnpm forc:check + + - name: Build + run: | + BUILD_VERSION="0.0.0-${{ github.ref_name }}-$(git rev-parse --short $GITHUB_SHA)" pnpm build + - name: Lint + run: | + pnpm lint + - name: Checking PR Number + uses: jwalton/gh-find-current-pr@v1 + id: findPr + + - name: Run tests and publish coverage + uses: ArtiomTr/jest-coverage-report-action@v2 + if: ${{ steps.findPr.outputs.number }} + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + package-manager: pnpm + annotations: failed-tests + test-script: pnpm ci:test + prnumber: ${{ steps.findPr.outputs.number }} + + - name: Run tests no coverage publishing + if: ${{ !steps.findPr.outputs.number }} + run: | + pnpm ci:test From 3549d51fcb5e4d8ba4ce191ddf4c48b57684ca16 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Mon, 27 Feb 2023 21:28:44 +0530 Subject: [PATCH 34/47] only run workflow for this pr --- .github/workflows/browser-e2e-tests.yaml | 4 ++-- .github/workflows/browser-unit-tests.yaml | 4 ++-- .github/workflows/node-e2e-tests.yaml | 4 ++-- .github/workflows/node-unit-tests.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/browser-e2e-tests.yaml b/.github/workflows/browser-e2e-tests.yaml index f94c3c880d4..b373e5a8ef9 100644 --- a/.github/workflows/browser-e2e-tests.yaml +++ b/.github/workflows/browser-e2e-tests.yaml @@ -2,8 +2,6 @@ name: "Browser e2e tests" on: pull_request: - branches: - - dp/testing-groups push: branches: - master @@ -14,6 +12,8 @@ concurrency: jobs: browser-e2e-tests: + # only run this job if the base branch is dp/testing-groups + if: github.base_ref == 'dp/testing-groups' runs-on: ubuntu-latest outputs: status: ${{ job.status }} diff --git a/.github/workflows/browser-unit-tests.yaml b/.github/workflows/browser-unit-tests.yaml index f70d5f046ef..81913a465b5 100644 --- a/.github/workflows/browser-unit-tests.yaml +++ b/.github/workflows/browser-unit-tests.yaml @@ -2,8 +2,6 @@ name: "Browser unit tests" on: pull_request: - branches: - - dp/testing-groups push: branches: - master @@ -14,6 +12,8 @@ concurrency: jobs: browser-unit-tests: + # only run this job if the base branch is dp/testing-groups + if: github.base_ref == 'dp/testing-groups' runs-on: ubuntu-latest outputs: status: ${{ job.status }} diff --git a/.github/workflows/node-e2e-tests.yaml b/.github/workflows/node-e2e-tests.yaml index 35149e74916..03411154054 100644 --- a/.github/workflows/node-e2e-tests.yaml +++ b/.github/workflows/node-e2e-tests.yaml @@ -2,8 +2,6 @@ name: "Node e2e tests" on: pull_request: - branches: - - dp/testing-groups push: branches: - master @@ -14,6 +12,8 @@ concurrency: jobs: node-e2e-tests: + # only run this job if the base branch is dp/testing-groups + if: github.base_ref == 'dp/testing-groups' runs-on: ubuntu-latest outputs: status: ${{ job.status }} diff --git a/.github/workflows/node-unit-tests.yaml b/.github/workflows/node-unit-tests.yaml index 319ea265474..334e6e2194c 100644 --- a/.github/workflows/node-unit-tests.yaml +++ b/.github/workflows/node-unit-tests.yaml @@ -2,8 +2,6 @@ name: "Node unit tests" on: pull_request: - branches: - - dp/testing-groups push: branches: - master @@ -14,6 +12,8 @@ concurrency: jobs: node-unit-tests: + # only run this job if the base branch is dp/testing-groups + if: github.base_ref == 'dp/testing-groups' runs-on: ubuntu-latest outputs: status: ${{ job.status }} From ab2f3b6a8711a37bae6f8d17bc527793a182859d Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Mon, 27 Feb 2023 21:30:01 +0530 Subject: [PATCH 35/47] only run workflow for this pr --- .github/workflows/browser-e2e-tests.yaml | 2 +- .github/workflows/browser-unit-tests.yaml | 2 +- .github/workflows/node-e2e-tests.yaml | 2 +- .github/workflows/node-unit-tests.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/browser-e2e-tests.yaml b/.github/workflows/browser-e2e-tests.yaml index b373e5a8ef9..386069f19a3 100644 --- a/.github/workflows/browser-e2e-tests.yaml +++ b/.github/workflows/browser-e2e-tests.yaml @@ -13,7 +13,7 @@ concurrency: jobs: browser-e2e-tests: # only run this job if the base branch is dp/testing-groups - if: github.base_ref == 'dp/testing-groups' + if: github.ref == 'dp/testing-groups' runs-on: ubuntu-latest outputs: status: ${{ job.status }} diff --git a/.github/workflows/browser-unit-tests.yaml b/.github/workflows/browser-unit-tests.yaml index 81913a465b5..b7f1c5f9d65 100644 --- a/.github/workflows/browser-unit-tests.yaml +++ b/.github/workflows/browser-unit-tests.yaml @@ -13,7 +13,7 @@ concurrency: jobs: browser-unit-tests: # only run this job if the base branch is dp/testing-groups - if: github.base_ref == 'dp/testing-groups' + if: github.ref == 'dp/testing-groups' runs-on: ubuntu-latest outputs: status: ${{ job.status }} diff --git a/.github/workflows/node-e2e-tests.yaml b/.github/workflows/node-e2e-tests.yaml index 03411154054..58aa681b265 100644 --- a/.github/workflows/node-e2e-tests.yaml +++ b/.github/workflows/node-e2e-tests.yaml @@ -13,7 +13,7 @@ concurrency: jobs: node-e2e-tests: # only run this job if the base branch is dp/testing-groups - if: github.base_ref == 'dp/testing-groups' + if: github.ref == 'dp/testing-groups' runs-on: ubuntu-latest outputs: status: ${{ job.status }} diff --git a/.github/workflows/node-unit-tests.yaml b/.github/workflows/node-unit-tests.yaml index 334e6e2194c..507ee53659e 100644 --- a/.github/workflows/node-unit-tests.yaml +++ b/.github/workflows/node-unit-tests.yaml @@ -13,7 +13,7 @@ concurrency: jobs: node-unit-tests: # only run this job if the base branch is dp/testing-groups - if: github.base_ref == 'dp/testing-groups' + if: github.ref == 'dp/testing-groups' runs-on: ubuntu-latest outputs: status: ${{ job.status }} From 3bc6561ab34bfb0851219b521131cb3ddd05135c Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Mon, 27 Feb 2023 21:32:29 +0530 Subject: [PATCH 36/47] only run workflow for this pr --- .github/workflows/browser-e2e-tests.yaml | 2 +- .github/workflows/browser-unit-tests.yaml | 2 +- .github/workflows/node-e2e-tests.yaml | 2 +- .github/workflows/node-unit-tests.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/browser-e2e-tests.yaml b/.github/workflows/browser-e2e-tests.yaml index 386069f19a3..f0f3b5a3d2d 100644 --- a/.github/workflows/browser-e2e-tests.yaml +++ b/.github/workflows/browser-e2e-tests.yaml @@ -13,7 +13,7 @@ concurrency: jobs: browser-e2e-tests: # only run this job if the base branch is dp/testing-groups - if: github.ref == 'dp/testing-groups' + if: github.ref_name == 'dp/testing-groups' runs-on: ubuntu-latest outputs: status: ${{ job.status }} diff --git a/.github/workflows/browser-unit-tests.yaml b/.github/workflows/browser-unit-tests.yaml index b7f1c5f9d65..9c36476298b 100644 --- a/.github/workflows/browser-unit-tests.yaml +++ b/.github/workflows/browser-unit-tests.yaml @@ -13,7 +13,7 @@ concurrency: jobs: browser-unit-tests: # only run this job if the base branch is dp/testing-groups - if: github.ref == 'dp/testing-groups' + if: github.ref_name == 'dp/testing-groups' runs-on: ubuntu-latest outputs: status: ${{ job.status }} diff --git a/.github/workflows/node-e2e-tests.yaml b/.github/workflows/node-e2e-tests.yaml index 58aa681b265..ab6fa4e3b39 100644 --- a/.github/workflows/node-e2e-tests.yaml +++ b/.github/workflows/node-e2e-tests.yaml @@ -13,7 +13,7 @@ concurrency: jobs: node-e2e-tests: # only run this job if the base branch is dp/testing-groups - if: github.ref == 'dp/testing-groups' + if: github.ref_name == 'dp/testing-groups' runs-on: ubuntu-latest outputs: status: ${{ job.status }} diff --git a/.github/workflows/node-unit-tests.yaml b/.github/workflows/node-unit-tests.yaml index 507ee53659e..b6fe32ddd69 100644 --- a/.github/workflows/node-unit-tests.yaml +++ b/.github/workflows/node-unit-tests.yaml @@ -13,7 +13,7 @@ concurrency: jobs: node-unit-tests: # only run this job if the base branch is dp/testing-groups - if: github.ref == 'dp/testing-groups' + if: github.ref_name == 'dp/testing-groups' runs-on: ubuntu-latest outputs: status: ${{ job.status }} From 905823671672710dd6f322d4ba583d485d793a0a Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Mon, 27 Feb 2023 21:40:20 +0530 Subject: [PATCH 37/47] only run workflow for this pr --- .github/workflows/browser-e2e-tests.yaml | 2 +- .github/workflows/browser-unit-tests.yaml | 2 +- .github/workflows/node-e2e-tests.yaml | 2 +- .github/workflows/node-unit-tests.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/browser-e2e-tests.yaml b/.github/workflows/browser-e2e-tests.yaml index f0f3b5a3d2d..b60dda1b47b 100644 --- a/.github/workflows/browser-e2e-tests.yaml +++ b/.github/workflows/browser-e2e-tests.yaml @@ -13,7 +13,7 @@ concurrency: jobs: browser-e2e-tests: # only run this job if the base branch is dp/testing-groups - if: github.ref_name == 'dp/testing-groups' + if: ${{github.ref_name == 'dp/testing-groups'}} runs-on: ubuntu-latest outputs: status: ${{ job.status }} diff --git a/.github/workflows/browser-unit-tests.yaml b/.github/workflows/browser-unit-tests.yaml index 9c36476298b..18844751ba3 100644 --- a/.github/workflows/browser-unit-tests.yaml +++ b/.github/workflows/browser-unit-tests.yaml @@ -13,7 +13,7 @@ concurrency: jobs: browser-unit-tests: # only run this job if the base branch is dp/testing-groups - if: github.ref_name == 'dp/testing-groups' + if: ${{github.ref_name == 'dp/testing-groups'}} runs-on: ubuntu-latest outputs: status: ${{ job.status }} diff --git a/.github/workflows/node-e2e-tests.yaml b/.github/workflows/node-e2e-tests.yaml index ab6fa4e3b39..cad72ce19f4 100644 --- a/.github/workflows/node-e2e-tests.yaml +++ b/.github/workflows/node-e2e-tests.yaml @@ -13,7 +13,7 @@ concurrency: jobs: node-e2e-tests: # only run this job if the base branch is dp/testing-groups - if: github.ref_name == 'dp/testing-groups' + if: ${{github.ref_name == 'dp/testing-groups'}} runs-on: ubuntu-latest outputs: status: ${{ job.status }} diff --git a/.github/workflows/node-unit-tests.yaml b/.github/workflows/node-unit-tests.yaml index b6fe32ddd69..11b1c1b5447 100644 --- a/.github/workflows/node-unit-tests.yaml +++ b/.github/workflows/node-unit-tests.yaml @@ -13,7 +13,7 @@ concurrency: jobs: node-unit-tests: # only run this job if the base branch is dp/testing-groups - if: github.ref_name == 'dp/testing-groups' + if: ${{github.ref_name == 'dp/testing-groups'}} runs-on: ubuntu-latest outputs: status: ${{ job.status }} From 131fbcdff43929ad1bf642318b50dc0bd28baba4 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Mon, 27 Feb 2023 21:42:15 +0530 Subject: [PATCH 38/47] Update browser-e2e-tests.yaml --- .github/workflows/browser-e2e-tests.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/browser-e2e-tests.yaml b/.github/workflows/browser-e2e-tests.yaml index b60dda1b47b..d0c10b6d173 100644 --- a/.github/workflows/browser-e2e-tests.yaml +++ b/.github/workflows/browser-e2e-tests.yaml @@ -13,11 +13,14 @@ concurrency: jobs: browser-e2e-tests: # only run this job if the base branch is dp/testing-groups - if: ${{github.ref_name == 'dp/testing-groups'}} + # if: ${{github.ref_name == 'dp/testing-groups'}} runs-on: ubuntu-latest outputs: status: ${{ job.status }} steps: + - name: Log out branch name + run: echo ${{github.ref_name}} + - name: Checkout uses: actions/checkout@v3 From 7a3e7ff8fb21a0bdaf8f719491a2ff48b0fd1d1e Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Mon, 27 Feb 2023 21:43:53 +0530 Subject: [PATCH 39/47] fix --- .github/workflows/browser-e2e-tests.yaml | 5 +---- .github/workflows/browser-unit-tests.yaml | 2 +- .github/workflows/node-e2e-tests.yaml | 2 +- .github/workflows/node-unit-tests.yaml | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/browser-e2e-tests.yaml b/.github/workflows/browser-e2e-tests.yaml index d0c10b6d173..33d53965a6d 100644 --- a/.github/workflows/browser-e2e-tests.yaml +++ b/.github/workflows/browser-e2e-tests.yaml @@ -13,14 +13,11 @@ concurrency: jobs: browser-e2e-tests: # only run this job if the base branch is dp/testing-groups - # if: ${{github.ref_name == 'dp/testing-groups'}} + if: ${{github.ref_name == '728/merge'}} runs-on: ubuntu-latest outputs: status: ${{ job.status }} steps: - - name: Log out branch name - run: echo ${{github.ref_name}} - - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/browser-unit-tests.yaml b/.github/workflows/browser-unit-tests.yaml index 18844751ba3..665e5fae8da 100644 --- a/.github/workflows/browser-unit-tests.yaml +++ b/.github/workflows/browser-unit-tests.yaml @@ -13,7 +13,7 @@ concurrency: jobs: browser-unit-tests: # only run this job if the base branch is dp/testing-groups - if: ${{github.ref_name == 'dp/testing-groups'}} + if: ${{github.ref_name == '728/merge'}} runs-on: ubuntu-latest outputs: status: ${{ job.status }} diff --git a/.github/workflows/node-e2e-tests.yaml b/.github/workflows/node-e2e-tests.yaml index cad72ce19f4..88bcf0ea424 100644 --- a/.github/workflows/node-e2e-tests.yaml +++ b/.github/workflows/node-e2e-tests.yaml @@ -13,7 +13,7 @@ concurrency: jobs: node-e2e-tests: # only run this job if the base branch is dp/testing-groups - if: ${{github.ref_name == 'dp/testing-groups'}} + if: ${{github.ref_name == '728/merge'}} runs-on: ubuntu-latest outputs: status: ${{ job.status }} diff --git a/.github/workflows/node-unit-tests.yaml b/.github/workflows/node-unit-tests.yaml index 11b1c1b5447..48ac9e5c2f2 100644 --- a/.github/workflows/node-unit-tests.yaml +++ b/.github/workflows/node-unit-tests.yaml @@ -13,7 +13,7 @@ concurrency: jobs: node-unit-tests: # only run this job if the base branch is dp/testing-groups - if: ${{github.ref_name == 'dp/testing-groups'}} + if: ${{github.ref_name == '728/merge'}} runs-on: ubuntu-latest outputs: status: ${{ job.status }} From 8b460f4a21feea0516aaf801be4483c3394ae0fb Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Mon, 27 Feb 2023 21:46:15 +0530 Subject: [PATCH 40/47] reset pr-lint workflow --- .github/workflows/pr-lint.yaml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/.github/workflows/pr-lint.yaml b/.github/workflows/pr-lint.yaml index 91cd82fe25d..6978cf6b1f2 100644 --- a/.github/workflows/pr-lint.yaml +++ b/.github/workflows/pr-lint.yaml @@ -20,8 +20,9 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - lint: - name: Lint + validate-changeset: + name: Validate PR Changeset + if: github.head_ref != 'changeset-release/master' runs-on: ubuntu-latest steps: - name: Checkout @@ -32,16 +33,5 @@ jobs: - name: CI Setup uses: ./.github/actions/ci-setup - - name: Build - run: | - BUILD_VERSION="0.0.0-${{ github.ref_name }}-$(git rev-parse --short $GITHUB_SHA)" pnpm build - - - name: Forc Format Check - run: pnpm forc:check - - - name: Lint - run: pnpm lint - - name: Validate Changeset - if: github.head_ref != 'changeset-release/master' run: pnpm changeset status --since=origin/master From bd5354eecfa0f7cf8796c9fd5c82ffcdd3b64324 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Mon, 6 Mar 2023 20:41:53 +0530 Subject: [PATCH 41/47] remove jest-runner-groups --- .github/workflows/browser-e2e-tests.yaml | 2 +- .github/workflows/browser-unit-tests.yaml | 2 +- .github/workflows/node-e2e-tests.yaml | 2 +- .github/workflows/node-unit-tests.yaml | 2 +- jest.config.ts | 1 - package.json | 1 - ...bi-coder.test.ts => abi-coder.node.unit.test.ts} | 3 --- .../coders/{coders.test.ts => coders.node.unit.ts} | 3 --- ...nterface.test.ts => interface.node.unit.test.ts} | 3 --- ...{json-abi.test.ts => json-abi.node.unit.test.ts} | 3 --- .../src/{Abi.test.ts => Abi.node.unit.test.ts} | 4 ---- ...TypeGen.test.ts => AbiTypeGen.node.unit.test.ts} | 0 .../src/{cli.test.ts => cli.node.unit.test.ts} | 0 ...{Function.test.ts => Function.node.unit.test.ts} | 0 .../src/{index.test.ts => index.node.unit.test.ts} | 0 ...Typegen.test.ts => runTypegen.node.unit.test.ts} | 0 .../{common.test.ts => common.node.unit.test.ts} | 0 .../contract/{dts.test.ts => dts.node.unit.test.ts} | 0 .../{factory.test.ts => factory.node.unit.test.ts} | 0 .../{index.test.ts => index.node.unit.test.ts} | 0 ....test.ts => renderHbsTemplate.node.unit.test.ts} | 0 ...rrayType.test.ts => ArrayType.node.unit.test.ts} | 0 ...{B256Type.test.ts => B256Type.node.unit.test.ts} | 0 ...{B512Type.test.ts => B512Type.node.unit.test.ts} | 0 ...{BoolType.test.ts => BoolType.node.unit.test.ts} | 0 ...{EnumType.test.ts => EnumType.node.unit.test.ts} | 0 ...icType.test.ts => GenericType.node.unit.test.ts} | 0 ...ionType.test.ts => OptionType.node.unit.test.ts} | 0 ...dPtr.test.ts => RawUntypedPtr.node.unit.test.ts} | 0 .../{StrType.test.ts => StrType.node.unit.test.ts} | 0 ...uctType.test.ts => StructType.node.unit.test.ts} | 0 ...upleType.test.ts => TupleType.node.unit.test.ts} | 0 .../{U16Type.test.ts => U16Type.node.unit.test.ts} | 0 .../{U32Type.test.ts => U32Type.node.unit.test.ts} | 0 .../{U64Type.test.ts => U64Type.node.unit.test.ts} | 0 .../{U8Type.test.ts => U8Type.node.unit.test.ts} | 0 ...torType.test.ts => VectorType.node.unit.test.ts} | 0 ....test.ts => extractStructName.node.unit.test.ts} | 0 ...{findType.test.ts => findType.node.unit.test.ts} | 0 ...ction.test.ts => makeFunction.node.unit.test.ts} | 0 ...{makeType.test.ts => makeType.node.unit.test.ts} | 0 ...ormalize.test.ts => normalize.node.unit.test.ts} | 0 ...ons.test.ts => parseFunctions.node.unit.test.ts} | 0 ...test.ts => parseTypeArguments.node.unit.test.ts} | 0 ...seTypes.test.ts => parseTypes.node.unit.test.ts} | 0 ...ype.test.ts => shouldSkipType.node.unit.test.ts} | 0 ...pes.test.ts => supportedTypes.node.unit.test.ts} | 0 ...{address.test.ts => address.common.unit.test.ts} | 3 --- ...ng.test.ts => advanced-logging.node.e2e.test.ts} | 3 --- ...esting.test.ts => auth-testing.node.e2e.test.ts} | 3 --- ....test.ts => call-test-contract.node.e2e.test.ts} | 3 --- ...ry.test.ts => contract-factory.node.e2e.test.ts} | 3 --- .../{contract.test.ts => contract.node.e2e.test.ts} | 3 --- ...t.test.ts => coverage-contract.node.e2e.test.ts} | 3 --- ...amples.test.ts => doc-examples.node.e2e.test.ts} | 3 --- ...ge-cases.test.ts => edge-cases.node.e2e.test.ts} | 3 --- ...t.ts => generic-types-contract.node.e2e.test.ts} | 0 ....test.ts => payable-annotation.node.e2e.test.ts} | 0 ...predicate.test.ts => predicate.node.e2e.test.ts} | 3 --- ...gs.test.ts => script-main-args.node.e2e.test.ts} | 0 ...st.ts => storage-test-contract.node.e2e.test.ts} | 3 --- ...test.ts => token-test-contract.node.e2e.test.ts} | 3 --- .../src/{cli.test.ts => cli.node.unit.test.ts} | 3 --- .../src/{index.test.ts => index.node.unit.test.ts} | 3 --- .../{hasher.test.ts => hasher.common.unit.test.ts} | 3 --- ...dwallet.test.ts => hdwallet.common.unit.test.ts} | 3 --- ...eystore.test.ts => keystore.common.unit.test.ts} | 3 --- .../math/src/{bn.test.ts => bn.common.unit.test.ts} | 3 --- ...ional.test.ts => functional.common.unit.test.ts} | 3 --- ...test.ts => binaryMerkleTree.common.unit.test.ts} | 3 --- ...ee.test.ts => sumMerkleTree.common.unit.test.ts} | 0 ...nemonic.test.ts => mnemonic.common.unit.test.ts} | 3 --- .../{utils.test.ts => utils.common.unit.test.ts} | 3 --- ...edicate.test.ts => predicate.common.e2e.test.ts} | 0 ...contract.test.ts => contract.common.e2e.test.ts} | 3 --- ...provider.test.ts => provider.common.e2e.test.ts} | 3 --- ...r.test.ts => block-explorer.common.unit.test.ts} | 0 .../{script.test.ts => script.common.e2e.test.ts} | 3 --- .../{signer.test.ts => signer.common.unit.test.ts} | 3 --- ...test.ts => sparseMerkleTree.common.unit.test.ts} | 3 --- ...array.test.ts => byte-array.common.unit.test.ts} | 3 --- .../{input.test.ts => input.common.unit.test.ts} | 3 --- .../{output.test.ts => output.common.unit.test.ts} | 3 --- ...{receipt.test.ts => receipt.common.unit.test.ts} | 3 --- ...lot.test.ts => storage-slot.common.unit.test.ts} | 3 --- ...tion.test.ts => transaction.common.unit.test.ts} | 3 --- ...inter.test.ts => tx-pointer.common.unit.test.ts} | 3 --- ...{utxo-id.test.ts => utxo-id.common.unit.test.ts} | 3 --- ...{witness.test.ts => witness.common.unit.test.ts} | 3 --- .../src/{cli.test.ts => cli.node.unit.test.ts} | 3 --- .../{index.test.ts => index.common.unit.test.ts} | 3 --- ...est.ts => colorizeUserVersion.node.unit.test.ts} | 3 --- ...est.ts => compareUserVersions.node.unit.test.ts} | 3 --- ...st.ts => getSupportedVersions.node.unit.test.ts} | 3 --- ...ns.test.ts => getUserVersions.node.unit.test.ts} | 3 --- ...e.test.ts => memory-storage.common.unit.test.ts} | 3 --- ...t.test.ts => mnemonic-vault.common.unit.test.ts} | 3 --- ...test.ts => privatekey-vault.common.unit.test.ts} | 3 --- ...r.test.ts => wallet-manager.common.unit.test.ts} | 3 --- .../{account.test.ts => account.common.e2e.test.ts} | 3 --- ...transfer.test.ts => transfer.common.e2e.test.ts} | 3 --- ...d.test.ts => wallet-unlocked.common.e2e.test.ts} | 3 --- .../{wallet.test.ts => wallet.common.e2e.test.ts} | 3 --- ...dlists.test.ts => wordlists.common.unit.test.ts} | 3 --- pnpm-lock.yaml | 13 ------------- 105 files changed, 4 insertions(+), 188 deletions(-) rename packages/abi-coder/src/{abi-coder.test.ts => abi-coder.node.unit.test.ts} (99%) rename packages/abi-coder/src/coders/{coders.test.ts => coders.node.unit.ts} (99%) rename packages/abi-coder/src/{interface.test.ts => interface.node.unit.test.ts} (99%) rename packages/abi-coder/src/{json-abi.test.ts => json-abi.node.unit.test.ts} (94%) rename packages/abi-typegen/src/{Abi.test.ts => Abi.node.unit.test.ts} (99%) rename packages/abi-typegen/src/{AbiTypeGen.test.ts => AbiTypeGen.node.unit.test.ts} (100%) rename packages/abi-typegen/src/{cli.test.ts => cli.node.unit.test.ts} (100%) rename packages/abi-typegen/src/functions/{Function.test.ts => Function.node.unit.test.ts} (100%) rename packages/abi-typegen/src/{index.test.ts => index.node.unit.test.ts} (100%) rename packages/abi-typegen/src/{runTypegen.test.ts => runTypegen.node.unit.test.ts} (100%) rename packages/abi-typegen/src/templates/common/{common.test.ts => common.node.unit.test.ts} (100%) rename packages/abi-typegen/src/templates/contract/{dts.test.ts => dts.node.unit.test.ts} (100%) rename packages/abi-typegen/src/templates/contract/{factory.test.ts => factory.node.unit.test.ts} (100%) rename packages/abi-typegen/src/templates/contract/{index.test.ts => index.node.unit.test.ts} (100%) rename packages/abi-typegen/src/templates/utils/{renderHbsTemplate.test.ts => renderHbsTemplate.node.unit.test.ts} (100%) rename packages/abi-typegen/src/types/{ArrayType.test.ts => ArrayType.node.unit.test.ts} (100%) rename packages/abi-typegen/src/types/{B256Type.test.ts => B256Type.node.unit.test.ts} (100%) rename packages/abi-typegen/src/types/{B512Type.test.ts => B512Type.node.unit.test.ts} (100%) rename packages/abi-typegen/src/types/{BoolType.test.ts => BoolType.node.unit.test.ts} (100%) rename packages/abi-typegen/src/types/{EnumType.test.ts => EnumType.node.unit.test.ts} (100%) rename packages/abi-typegen/src/types/{GenericType.test.ts => GenericType.node.unit.test.ts} (100%) rename packages/abi-typegen/src/types/{OptionType.test.ts => OptionType.node.unit.test.ts} (100%) rename packages/abi-typegen/src/types/{RawUntypedPtr.test.ts => RawUntypedPtr.node.unit.test.ts} (100%) rename packages/abi-typegen/src/types/{StrType.test.ts => StrType.node.unit.test.ts} (100%) rename packages/abi-typegen/src/types/{StructType.test.ts => StructType.node.unit.test.ts} (100%) rename packages/abi-typegen/src/types/{TupleType.test.ts => TupleType.node.unit.test.ts} (100%) rename packages/abi-typegen/src/types/{U16Type.test.ts => U16Type.node.unit.test.ts} (100%) rename packages/abi-typegen/src/types/{U32Type.test.ts => U32Type.node.unit.test.ts} (100%) rename packages/abi-typegen/src/types/{U64Type.test.ts => U64Type.node.unit.test.ts} (100%) rename packages/abi-typegen/src/types/{U8Type.test.ts => U8Type.node.unit.test.ts} (100%) rename packages/abi-typegen/src/types/{VectorType.test.ts => VectorType.node.unit.test.ts} (100%) rename packages/abi-typegen/src/utils/{extractStructName.test.ts => extractStructName.node.unit.test.ts} (100%) rename packages/abi-typegen/src/utils/{findType.test.ts => findType.node.unit.test.ts} (100%) rename packages/abi-typegen/src/utils/{makeFunction.test.ts => makeFunction.node.unit.test.ts} (100%) rename packages/abi-typegen/src/utils/{makeType.test.ts => makeType.node.unit.test.ts} (100%) rename packages/abi-typegen/src/utils/{normalize.test.ts => normalize.node.unit.test.ts} (100%) rename packages/abi-typegen/src/utils/{parseFunctions.test.ts => parseFunctions.node.unit.test.ts} (100%) rename packages/abi-typegen/src/utils/{parseTypeArguments.test.ts => parseTypeArguments.node.unit.test.ts} (100%) rename packages/abi-typegen/src/utils/{parseTypes.test.ts => parseTypes.node.unit.test.ts} (100%) rename packages/abi-typegen/src/utils/{shouldSkipType.test.ts => shouldSkipType.node.unit.test.ts} (100%) rename packages/abi-typegen/src/utils/{supportedTypes.test.ts => supportedTypes.node.unit.test.ts} (100%) rename packages/address/src/{address.test.ts => address.common.unit.test.ts} (99%) rename packages/fuel-gauge/src/{advanced-logging.test.ts => advanced-logging.node.e2e.test.ts} (99%) rename packages/fuel-gauge/src/{auth-testing.test.ts => auth-testing.node.e2e.test.ts} (98%) rename packages/fuel-gauge/src/{call-test-contract.test.ts => call-test-contract.node.e2e.test.ts} (99%) rename packages/fuel-gauge/src/{contract-factory.test.ts => contract-factory.node.e2e.test.ts} (99%) rename packages/fuel-gauge/src/{contract.test.ts => contract.node.e2e.test.ts} (99%) rename packages/fuel-gauge/src/{coverage-contract.test.ts => coverage-contract.node.e2e.test.ts} (99%) rename packages/fuel-gauge/src/{doc-examples.test.ts => doc-examples.node.e2e.test.ts} (99%) rename packages/fuel-gauge/src/{edge-cases.test.ts => edge-cases.node.e2e.test.ts} (91%) rename packages/fuel-gauge/src/{generic-types-contract.test.ts => generic-types-contract.node.e2e.test.ts} (100%) rename packages/fuel-gauge/src/{payable-annotation.test.ts => payable-annotation.node.e2e.test.ts} (100%) rename packages/fuel-gauge/src/{predicate.test.ts => predicate.node.e2e.test.ts} (99%) rename packages/fuel-gauge/src/{script-main-args.test.ts => script-main-args.node.e2e.test.ts} (100%) rename packages/fuel-gauge/src/{storage-test-contract.test.ts => storage-test-contract.node.e2e.test.ts} (98%) rename packages/fuel-gauge/src/{token-test-contract.test.ts => token-test-contract.node.e2e.test.ts} (99%) rename packages/fuels/src/{cli.test.ts => cli.node.unit.test.ts} (97%) rename packages/fuels/src/{index.test.ts => index.node.unit.test.ts} (95%) rename packages/hasher/src/{hasher.test.ts => hasher.common.unit.test.ts} (96%) rename packages/hdwallet/src/{hdwallet.test.ts => hdwallet.common.unit.test.ts} (99%) rename packages/keystore/src/{keystore.test.ts => keystore.common.unit.test.ts} (98%) rename packages/math/src/{bn.test.ts => bn.common.unit.test.ts} (99%) rename packages/math/src/{functional.test.ts => functional.common.unit.test.ts} (96%) rename packages/merkle/src/{binaryMerkleTree.test.ts => binaryMerkleTree.common.unit.test.ts} (97%) rename packages/merklesum/src/{sumMerkleTree.test.ts => sumMerkleTree.common.unit.test.ts} (100%) rename packages/mnemonic/src/{mnemonic.test.ts => mnemonic.common.unit.test.ts} (99%) rename packages/mnemonic/src/{utils.test.ts => utils.common.unit.test.ts} (94%) rename packages/predicate/src/{predicate.test.ts => predicate.common.e2e.test.ts} (100%) rename packages/program/src/{contract.test.ts => contract.common.e2e.test.ts} (98%) rename packages/providers/src/{provider.test.ts => provider.common.e2e.test.ts} (99%) rename packages/providers/src/utils/{block-explorer.test.ts => block-explorer.common.unit.test.ts} (100%) rename packages/script/src/{script.test.ts => script.common.e2e.test.ts} (99%) rename packages/signer/src/{signer.test.ts => signer.common.unit.test.ts} (98%) rename packages/sparsemerkle/src/{sparseMerkleTree.test.ts => sparseMerkleTree.common.unit.test.ts} (99%) rename packages/transactions/src/coders/{byte-array.test.ts => byte-array.common.unit.test.ts} (96%) rename packages/transactions/src/coders/{input.test.ts => input.common.unit.test.ts} (99%) rename packages/transactions/src/coders/{output.test.ts => output.common.unit.test.ts} (99%) rename packages/transactions/src/coders/{receipt.test.ts => receipt.common.unit.test.ts} (99%) rename packages/transactions/src/coders/{storage-slot.test.ts => storage-slot.common.unit.test.ts} (96%) rename packages/transactions/src/coders/{transaction.test.ts => transaction.common.unit.test.ts} (99%) rename packages/transactions/src/coders/{tx-pointer.test.ts => tx-pointer.common.unit.test.ts} (97%) rename packages/transactions/src/coders/{utxo-id.test.ts => utxo-id.common.unit.test.ts} (97%) rename packages/transactions/src/coders/{witness.test.ts => witness.common.unit.test.ts} (97%) rename packages/versions/src/{cli.test.ts => cli.node.unit.test.ts} (99%) rename packages/versions/src/{index.test.ts => index.common.unit.test.ts} (85%) rename packages/versions/src/lib/{colorizeUserVersion.test.ts => colorizeUserVersion.node.unit.test.ts} (96%) rename packages/versions/src/lib/{compareUserVersions.test.ts => compareUserVersions.node.unit.test.ts} (98%) rename packages/versions/src/lib/{getSupportedVersions.test.ts => getSupportedVersions.node.unit.test.ts} (97%) rename packages/versions/src/lib/{getUserVersions.test.ts => getUserVersions.node.unit.test.ts} (98%) rename packages/wallet-manager/src/storages/{memory-storage.test.ts => memory-storage.common.unit.test.ts} (95%) rename packages/wallet-manager/src/vaults/{mnemonic-vault.test.ts => mnemonic-vault.common.unit.test.ts} (98%) rename packages/wallet-manager/src/vaults/{privatekey-vault.test.ts => privatekey-vault.common.unit.test.ts} (98%) rename packages/wallet-manager/src/{wallet-manager.test.ts => wallet-manager.common.unit.test.ts} (99%) rename packages/wallet/src/{account.test.ts => account.common.e2e.test.ts} (99%) rename packages/wallet/src/{transfer.test.ts => transfer.common.e2e.test.ts} (99%) rename packages/wallet/src/{wallet-unlocked.test.ts => wallet-unlocked.common.e2e.test.ts} (99%) rename packages/wallet/src/{wallet.test.ts => wallet.common.e2e.test.ts} (99%) rename packages/wordlists/src/{wordlists.test.ts => wordlists.common.unit.test.ts} (93%) diff --git a/.github/workflows/browser-e2e-tests.yaml b/.github/workflows/browser-e2e-tests.yaml index 33d53965a6d..37912ee94f7 100644 --- a/.github/workflows/browser-e2e-tests.yaml +++ b/.github/workflows/browser-e2e-tests.yaml @@ -32,7 +32,7 @@ jobs: run: pnpm services:run - name: Browser e2e tests - run: pnpm test -- --group=common/e2e --setupFilesAfterEnv=./setup-puppeteer.ts --testTimeout=30000 --coverage + run: pnpm test -- **/*.common.e2e.test.ts --setupFilesAfterEnv=./setup-puppeteer.ts --testTimeout=30000 --coverage - name: Upload coverage to Github artifacts uses: actions/upload-artifact@v2 diff --git a/.github/workflows/browser-unit-tests.yaml b/.github/workflows/browser-unit-tests.yaml index 665e5fae8da..6e9aa7d5a51 100644 --- a/.github/workflows/browser-unit-tests.yaml +++ b/.github/workflows/browser-unit-tests.yaml @@ -29,7 +29,7 @@ jobs: BUILD_VERSION="0.0.0-${{ github.ref_name }}-$(git rev-parse --short $GITHUB_SHA)" pnpm build - name: Browser unit tests - run: pnpm test -- --group=common/unit --setupFilesAfterEnv=./setup-puppeteer.ts --testTimeout=30000 --coverage + run: pnpm test -- **/*.common.unit.test.ts --setupFilesAfterEnv=./setup-puppeteer.ts --testTimeout=30000 --coverage - name: Upload coverage to Github artifacts uses: actions/upload-artifact@v2 diff --git a/.github/workflows/node-e2e-tests.yaml b/.github/workflows/node-e2e-tests.yaml index 88bcf0ea424..17e571a6984 100644 --- a/.github/workflows/node-e2e-tests.yaml +++ b/.github/workflows/node-e2e-tests.yaml @@ -32,7 +32,7 @@ jobs: run: pnpm services:run - name: Node e2e tests - run: pnpm test -- --group=node/e2e --group=common/e2e --coverage + run: pnpm test -- **/*.node.e2e.test.ts --group=common/e2e --coverage - name: Upload coverage to Github artifacts uses: actions/upload-artifact@v2 diff --git a/.github/workflows/node-unit-tests.yaml b/.github/workflows/node-unit-tests.yaml index 48ac9e5c2f2..7f993016a39 100644 --- a/.github/workflows/node-unit-tests.yaml +++ b/.github/workflows/node-unit-tests.yaml @@ -29,7 +29,7 @@ jobs: BUILD_VERSION="0.0.0-${{ github.ref_name }}-$(git rev-parse --short $GITHUB_SHA)" pnpm build - name: Node unit tests - run: pnpm test -- --group=node/unit --group=common/unit --coverage + run: pnpm test -- **/*.node.unit.test.ts --group=common/unit --coverage - name: Upload coverage to Github artifacts uses: actions/upload-artifact@v2 diff --git a/jest.config.ts b/jest.config.ts index 358b4edfa20..fbddade971e 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -8,7 +8,6 @@ const config: Config.InitialOptions = { modulePathIgnorePatterns: ['/dist/'], coveragePathIgnorePatterns: ['/dist/', '/test/', '.test.ts', '.d.ts'], testTimeout: 15000, - runner: 'groups', transform: { '\\.hbs': 'jest-text-transformer', }, diff --git a/package.json b/package.json index 81796722064..a118b01da12 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,6 @@ "forc-bin": "workspace:*", "husky": "^8.0.3", "jest": "^29.3.1", - "jest-runner-groups": "^2.2.0", "jest-text-transformer": "^1.0.4", "markdownlint": "^0.23.1", "markdownlint-cli": "^0.27.1", diff --git a/packages/abi-coder/src/abi-coder.test.ts b/packages/abi-coder/src/abi-coder.node.unit.test.ts similarity index 99% rename from packages/abi-coder/src/abi-coder.test.ts rename to packages/abi-coder/src/abi-coder.node.unit.test.ts index b22fbf328ef..1c011f540a8 100644 --- a/packages/abi-coder/src/abi-coder.test.ts +++ b/packages/abi-coder/src/abi-coder.node.unit.test.ts @@ -6,9 +6,6 @@ import type { DecodedValue } from './coders/abstract-coder'; const B256 = '0xd5579c46dfcc7f18207013e65b44e4cb4e2c2298f4ac457ba8f82743f31e930b'; -/* - * @group node/unit - */ describe('AbiCoder', () => { const abiCoder = new AbiCoder(); diff --git a/packages/abi-coder/src/coders/coders.test.ts b/packages/abi-coder/src/coders/coders.node.unit.ts similarity index 99% rename from packages/abi-coder/src/coders/coders.test.ts rename to packages/abi-coder/src/coders/coders.node.unit.ts index f1341249577..053a393cfdf 100644 --- a/packages/abi-coder/src/coders/coders.test.ts +++ b/packages/abi-coder/src/coders/coders.node.unit.ts @@ -290,9 +290,6 @@ const testCases = [ ], ] as const; -/* - * @group node/unit - */ describe.each(testCases)('%s', (coderName, goodCases, badCases) => { it.each( goodCases.map(([coder, input, output]): [string, any, any, Coder] => [ diff --git a/packages/abi-coder/src/interface.test.ts b/packages/abi-coder/src/interface.node.unit.test.ts similarity index 99% rename from packages/abi-coder/src/interface.test.ts rename to packages/abi-coder/src/interface.node.unit.test.ts index 0d9ad0e011e..3fd276e200f 100644 --- a/packages/abi-coder/src/interface.test.ts +++ b/packages/abi-coder/src/interface.node.unit.test.ts @@ -4,9 +4,6 @@ import { toHex } from '@fuel-ts/math'; import FunctionFragment from './fragments/function-fragment'; import Interface from './interface'; -/* - * @group node/unit - */ describe('Interface', () => { const jsonFragment = { type: 'function', diff --git a/packages/abi-coder/src/json-abi.test.ts b/packages/abi-coder/src/json-abi.node.unit.test.ts similarity index 94% rename from packages/abi-coder/src/json-abi.test.ts rename to packages/abi-coder/src/json-abi.node.unit.test.ts index 8d6d106a5f8..650d6d5e011 100644 --- a/packages/abi-coder/src/json-abi.test.ts +++ b/packages/abi-coder/src/json-abi.node.unit.test.ts @@ -1,8 +1,5 @@ import { isReferenceType } from './json-abi'; -/* - * @group node/unit - */ describe('JSON ABI', () => { it.each(['u8', 'u16', 'u32', 'u64', 'bool'])( `should return false when it's not reference type`, diff --git a/packages/abi-typegen/src/Abi.test.ts b/packages/abi-typegen/src/Abi.node.unit.test.ts similarity index 99% rename from packages/abi-typegen/src/Abi.test.ts rename to packages/abi-typegen/src/Abi.node.unit.test.ts index 006f9885ae9..2e93ac71de4 100644 --- a/packages/abi-typegen/src/Abi.test.ts +++ b/packages/abi-typegen/src/Abi.node.unit.test.ts @@ -12,10 +12,6 @@ import { VectorType } from './types/VectorType'; import * as parseFunctionsMod from './utils/parseFunctions'; import * as parseTypesMod from './utils/parseTypes'; -/* - * @group node/unit - */ - describe('Abi.ts', () => { /* Test helpers diff --git a/packages/abi-typegen/src/AbiTypeGen.test.ts b/packages/abi-typegen/src/AbiTypeGen.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/AbiTypeGen.test.ts rename to packages/abi-typegen/src/AbiTypeGen.node.unit.test.ts diff --git a/packages/abi-typegen/src/cli.test.ts b/packages/abi-typegen/src/cli.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/cli.test.ts rename to packages/abi-typegen/src/cli.node.unit.test.ts diff --git a/packages/abi-typegen/src/functions/Function.test.ts b/packages/abi-typegen/src/functions/Function.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/functions/Function.test.ts rename to packages/abi-typegen/src/functions/Function.node.unit.test.ts diff --git a/packages/abi-typegen/src/index.test.ts b/packages/abi-typegen/src/index.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/index.test.ts rename to packages/abi-typegen/src/index.node.unit.test.ts diff --git a/packages/abi-typegen/src/runTypegen.test.ts b/packages/abi-typegen/src/runTypegen.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/runTypegen.test.ts rename to packages/abi-typegen/src/runTypegen.node.unit.test.ts diff --git a/packages/abi-typegen/src/templates/common/common.test.ts b/packages/abi-typegen/src/templates/common/common.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/templates/common/common.test.ts rename to packages/abi-typegen/src/templates/common/common.node.unit.test.ts diff --git a/packages/abi-typegen/src/templates/contract/dts.test.ts b/packages/abi-typegen/src/templates/contract/dts.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/templates/contract/dts.test.ts rename to packages/abi-typegen/src/templates/contract/dts.node.unit.test.ts diff --git a/packages/abi-typegen/src/templates/contract/factory.test.ts b/packages/abi-typegen/src/templates/contract/factory.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/templates/contract/factory.test.ts rename to packages/abi-typegen/src/templates/contract/factory.node.unit.test.ts diff --git a/packages/abi-typegen/src/templates/contract/index.test.ts b/packages/abi-typegen/src/templates/contract/index.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/templates/contract/index.test.ts rename to packages/abi-typegen/src/templates/contract/index.node.unit.test.ts diff --git a/packages/abi-typegen/src/templates/utils/renderHbsTemplate.test.ts b/packages/abi-typegen/src/templates/utils/renderHbsTemplate.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/templates/utils/renderHbsTemplate.test.ts rename to packages/abi-typegen/src/templates/utils/renderHbsTemplate.node.unit.test.ts diff --git a/packages/abi-typegen/src/types/ArrayType.test.ts b/packages/abi-typegen/src/types/ArrayType.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/types/ArrayType.test.ts rename to packages/abi-typegen/src/types/ArrayType.node.unit.test.ts diff --git a/packages/abi-typegen/src/types/B256Type.test.ts b/packages/abi-typegen/src/types/B256Type.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/types/B256Type.test.ts rename to packages/abi-typegen/src/types/B256Type.node.unit.test.ts diff --git a/packages/abi-typegen/src/types/B512Type.test.ts b/packages/abi-typegen/src/types/B512Type.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/types/B512Type.test.ts rename to packages/abi-typegen/src/types/B512Type.node.unit.test.ts diff --git a/packages/abi-typegen/src/types/BoolType.test.ts b/packages/abi-typegen/src/types/BoolType.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/types/BoolType.test.ts rename to packages/abi-typegen/src/types/BoolType.node.unit.test.ts diff --git a/packages/abi-typegen/src/types/EnumType.test.ts b/packages/abi-typegen/src/types/EnumType.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/types/EnumType.test.ts rename to packages/abi-typegen/src/types/EnumType.node.unit.test.ts diff --git a/packages/abi-typegen/src/types/GenericType.test.ts b/packages/abi-typegen/src/types/GenericType.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/types/GenericType.test.ts rename to packages/abi-typegen/src/types/GenericType.node.unit.test.ts diff --git a/packages/abi-typegen/src/types/OptionType.test.ts b/packages/abi-typegen/src/types/OptionType.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/types/OptionType.test.ts rename to packages/abi-typegen/src/types/OptionType.node.unit.test.ts diff --git a/packages/abi-typegen/src/types/RawUntypedPtr.test.ts b/packages/abi-typegen/src/types/RawUntypedPtr.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/types/RawUntypedPtr.test.ts rename to packages/abi-typegen/src/types/RawUntypedPtr.node.unit.test.ts diff --git a/packages/abi-typegen/src/types/StrType.test.ts b/packages/abi-typegen/src/types/StrType.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/types/StrType.test.ts rename to packages/abi-typegen/src/types/StrType.node.unit.test.ts diff --git a/packages/abi-typegen/src/types/StructType.test.ts b/packages/abi-typegen/src/types/StructType.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/types/StructType.test.ts rename to packages/abi-typegen/src/types/StructType.node.unit.test.ts diff --git a/packages/abi-typegen/src/types/TupleType.test.ts b/packages/abi-typegen/src/types/TupleType.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/types/TupleType.test.ts rename to packages/abi-typegen/src/types/TupleType.node.unit.test.ts diff --git a/packages/abi-typegen/src/types/U16Type.test.ts b/packages/abi-typegen/src/types/U16Type.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/types/U16Type.test.ts rename to packages/abi-typegen/src/types/U16Type.node.unit.test.ts diff --git a/packages/abi-typegen/src/types/U32Type.test.ts b/packages/abi-typegen/src/types/U32Type.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/types/U32Type.test.ts rename to packages/abi-typegen/src/types/U32Type.node.unit.test.ts diff --git a/packages/abi-typegen/src/types/U64Type.test.ts b/packages/abi-typegen/src/types/U64Type.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/types/U64Type.test.ts rename to packages/abi-typegen/src/types/U64Type.node.unit.test.ts diff --git a/packages/abi-typegen/src/types/U8Type.test.ts b/packages/abi-typegen/src/types/U8Type.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/types/U8Type.test.ts rename to packages/abi-typegen/src/types/U8Type.node.unit.test.ts diff --git a/packages/abi-typegen/src/types/VectorType.test.ts b/packages/abi-typegen/src/types/VectorType.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/types/VectorType.test.ts rename to packages/abi-typegen/src/types/VectorType.node.unit.test.ts diff --git a/packages/abi-typegen/src/utils/extractStructName.test.ts b/packages/abi-typegen/src/utils/extractStructName.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/utils/extractStructName.test.ts rename to packages/abi-typegen/src/utils/extractStructName.node.unit.test.ts diff --git a/packages/abi-typegen/src/utils/findType.test.ts b/packages/abi-typegen/src/utils/findType.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/utils/findType.test.ts rename to packages/abi-typegen/src/utils/findType.node.unit.test.ts diff --git a/packages/abi-typegen/src/utils/makeFunction.test.ts b/packages/abi-typegen/src/utils/makeFunction.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/utils/makeFunction.test.ts rename to packages/abi-typegen/src/utils/makeFunction.node.unit.test.ts diff --git a/packages/abi-typegen/src/utils/makeType.test.ts b/packages/abi-typegen/src/utils/makeType.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/utils/makeType.test.ts rename to packages/abi-typegen/src/utils/makeType.node.unit.test.ts diff --git a/packages/abi-typegen/src/utils/normalize.test.ts b/packages/abi-typegen/src/utils/normalize.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/utils/normalize.test.ts rename to packages/abi-typegen/src/utils/normalize.node.unit.test.ts diff --git a/packages/abi-typegen/src/utils/parseFunctions.test.ts b/packages/abi-typegen/src/utils/parseFunctions.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/utils/parseFunctions.test.ts rename to packages/abi-typegen/src/utils/parseFunctions.node.unit.test.ts diff --git a/packages/abi-typegen/src/utils/parseTypeArguments.test.ts b/packages/abi-typegen/src/utils/parseTypeArguments.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/utils/parseTypeArguments.test.ts rename to packages/abi-typegen/src/utils/parseTypeArguments.node.unit.test.ts diff --git a/packages/abi-typegen/src/utils/parseTypes.test.ts b/packages/abi-typegen/src/utils/parseTypes.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/utils/parseTypes.test.ts rename to packages/abi-typegen/src/utils/parseTypes.node.unit.test.ts diff --git a/packages/abi-typegen/src/utils/shouldSkipType.test.ts b/packages/abi-typegen/src/utils/shouldSkipType.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/utils/shouldSkipType.test.ts rename to packages/abi-typegen/src/utils/shouldSkipType.node.unit.test.ts diff --git a/packages/abi-typegen/src/utils/supportedTypes.test.ts b/packages/abi-typegen/src/utils/supportedTypes.node.unit.test.ts similarity index 100% rename from packages/abi-typegen/src/utils/supportedTypes.test.ts rename to packages/abi-typegen/src/utils/supportedTypes.node.unit.test.ts diff --git a/packages/address/src/address.test.ts b/packages/address/src/address.common.unit.test.ts similarity index 99% rename from packages/address/src/address.test.ts rename to packages/address/src/address.common.unit.test.ts index 3bf30b5aaaa..879fbfc8079 100644 --- a/packages/address/src/address.test.ts +++ b/packages/address/src/address.common.unit.test.ts @@ -17,9 +17,6 @@ const ADDRESS_BYTES = [ 226, 174, 6, 54, 251, 51, 211, 203, 42, 158, 74, ]; -/* - * @group common/unit - */ describe('Address utils', () => { test('fromBech32 (bech32 to decoded bech32)', async () => { const result = utils.fromBech32(ADDRESS_BECH32); diff --git a/packages/fuel-gauge/src/advanced-logging.test.ts b/packages/fuel-gauge/src/advanced-logging.node.e2e.test.ts similarity index 99% rename from packages/fuel-gauge/src/advanced-logging.test.ts rename to packages/fuel-gauge/src/advanced-logging.node.e2e.test.ts index 8147b1bebf1..f988605bdb6 100644 --- a/packages/fuel-gauge/src/advanced-logging.test.ts +++ b/packages/fuel-gauge/src/advanced-logging.node.e2e.test.ts @@ -14,9 +14,6 @@ beforeAll(async () => { otherContractInstance = await setupOtherContract({ cache: false }); }); -/* - * @group node/e2e - */ describe('Advanced Logging', () => { it('can get log data', async () => { const { value, logs } = await contractInstance.functions.test_function().call(); diff --git a/packages/fuel-gauge/src/auth-testing.test.ts b/packages/fuel-gauge/src/auth-testing.node.e2e.test.ts similarity index 98% rename from packages/fuel-gauge/src/auth-testing.test.ts rename to packages/fuel-gauge/src/auth-testing.node.e2e.test.ts index db2cf4cfec9..755750621db 100644 --- a/packages/fuel-gauge/src/auth-testing.test.ts +++ b/packages/fuel-gauge/src/auth-testing.node.e2e.test.ts @@ -9,9 +9,6 @@ import FactoryAbi from '../test-projects/auth_testing_contract/out/debug/auth_te let contractInstance: Contract; let wallet: WalletUnlocked; -/* - * @group node/e2e - */ describe('Auth Testing', () => { beforeAll(async () => { const provider = new Provider('http://127.0.0.1:4000/graphql'); diff --git a/packages/fuel-gauge/src/call-test-contract.test.ts b/packages/fuel-gauge/src/call-test-contract.node.e2e.test.ts similarity index 99% rename from packages/fuel-gauge/src/call-test-contract.test.ts rename to packages/fuel-gauge/src/call-test-contract.node.e2e.test.ts index b39b1b80079..bde8a52ccfa 100644 --- a/packages/fuel-gauge/src/call-test-contract.test.ts +++ b/packages/fuel-gauge/src/call-test-contract.node.e2e.test.ts @@ -18,9 +18,6 @@ const setupContract = createSetupConfig({ const U64_MAX = bn(2).pow(64).sub(1); -/* - * @group node/e2e - */ describe('CallTestContract', () => { it.each([0, 1337, U64_MAX.sub(1)])('can call a contract with u64 (%p)', async (num) => { const contract = await setupContract(); diff --git a/packages/fuel-gauge/src/contract-factory.test.ts b/packages/fuel-gauge/src/contract-factory.node.e2e.test.ts similarity index 99% rename from packages/fuel-gauge/src/contract-factory.test.ts rename to packages/fuel-gauge/src/contract-factory.node.e2e.test.ts index 5d1a6e849cd..7e03003e4d7 100644 --- a/packages/fuel-gauge/src/contract-factory.test.ts +++ b/packages/fuel-gauge/src/contract-factory.node.e2e.test.ts @@ -5,9 +5,6 @@ import { join } from 'path'; import storageSlots from '../test-projects/storage-test-contract/out/debug/storage-test-storage_slots.json'; -/* - * @group node/e2e - */ describe('Contract Factory', () => { const createContractFactory = async () => { // #region typedoc:contract-setup diff --git a/packages/fuel-gauge/src/contract.test.ts b/packages/fuel-gauge/src/contract.node.e2e.test.ts similarity index 99% rename from packages/fuel-gauge/src/contract.test.ts rename to packages/fuel-gauge/src/contract.node.e2e.test.ts index f1a40802fa1..7cd48f4b06a 100644 --- a/packages/fuel-gauge/src/contract.test.ts +++ b/packages/fuel-gauge/src/contract.node.e2e.test.ts @@ -64,9 +64,6 @@ const complexFragment = { const AltToken = '0x0101010101010101010101010101010101010101010101010101010101010101'; -/* - * @group node/e2e - */ describe('Contract', () => { it('generates function methods on a simple contract', async () => { const provider = new Provider('http://127.0.0.1:4000/graphql'); diff --git a/packages/fuel-gauge/src/coverage-contract.test.ts b/packages/fuel-gauge/src/coverage-contract.node.e2e.test.ts similarity index 99% rename from packages/fuel-gauge/src/coverage-contract.test.ts rename to packages/fuel-gauge/src/coverage-contract.node.e2e.test.ts index 3a709ee53d2..69b2877085c 100644 --- a/packages/fuel-gauge/src/coverage-contract.test.ts +++ b/packages/fuel-gauge/src/coverage-contract.node.e2e.test.ts @@ -24,9 +24,6 @@ beforeAll(async () => { contractInstance = await setupContract(); }); -/* - * @group node/e2e - */ describe('Coverage Contract', () => { it('can return outputs', async () => { // Call contract methods diff --git a/packages/fuel-gauge/src/doc-examples.test.ts b/packages/fuel-gauge/src/doc-examples.node.e2e.test.ts similarity index 99% rename from packages/fuel-gauge/src/doc-examples.test.ts rename to packages/fuel-gauge/src/doc-examples.node.e2e.test.ts index aa7f12d54ed..cd65a528cc2 100644 --- a/packages/fuel-gauge/src/doc-examples.test.ts +++ b/packages/fuel-gauge/src/doc-examples.node.e2e.test.ts @@ -38,9 +38,6 @@ const ADDRESS_BYTES = new Uint8Array([ 89, 94, 110, 63, 189, 57, 42, 79, 62, 110, ]); -/* - * @group node/e2e - */ test('it has an Address class using bech32Address', () => { // #region typedoc:Address-bech32 // #context import { Address } from 'fuels'; diff --git a/packages/fuel-gauge/src/edge-cases.test.ts b/packages/fuel-gauge/src/edge-cases.node.e2e.test.ts similarity index 91% rename from packages/fuel-gauge/src/edge-cases.test.ts rename to packages/fuel-gauge/src/edge-cases.node.e2e.test.ts index 87173c8dc1b..635e1f80ac8 100644 --- a/packages/fuel-gauge/src/edge-cases.test.ts +++ b/packages/fuel-gauge/src/edge-cases.node.e2e.test.ts @@ -1,8 +1,5 @@ import { getSetupContract } from './utils'; -/* - * @group node/e2e - */ describe('Edge Cases', () => { it('can run collision_in_fn_names', async () => { const contract = await getSetupContract('collision_in_fn_names')(); diff --git a/packages/fuel-gauge/src/generic-types-contract.test.ts b/packages/fuel-gauge/src/generic-types-contract.node.e2e.test.ts similarity index 100% rename from packages/fuel-gauge/src/generic-types-contract.test.ts rename to packages/fuel-gauge/src/generic-types-contract.node.e2e.test.ts diff --git a/packages/fuel-gauge/src/payable-annotation.test.ts b/packages/fuel-gauge/src/payable-annotation.node.e2e.test.ts similarity index 100% rename from packages/fuel-gauge/src/payable-annotation.test.ts rename to packages/fuel-gauge/src/payable-annotation.node.e2e.test.ts diff --git a/packages/fuel-gauge/src/predicate.test.ts b/packages/fuel-gauge/src/predicate.node.e2e.test.ts similarity index 99% rename from packages/fuel-gauge/src/predicate.test.ts rename to packages/fuel-gauge/src/predicate.node.e2e.test.ts index 8863c4fc027..e128e3c1727 100644 --- a/packages/fuel-gauge/src/predicate.test.ts +++ b/packages/fuel-gauge/src/predicate.node.e2e.test.ts @@ -205,9 +205,6 @@ const StructAbiInputs = { loggedTypes: [], }; -/* - * @group node/e2e - */ describe('Predicate', () => { it('can call a no-arg Predicate that returns true', async () => { const [wallet, receiver] = await setup(); diff --git a/packages/fuel-gauge/src/script-main-args.test.ts b/packages/fuel-gauge/src/script-main-args.node.e2e.test.ts similarity index 100% rename from packages/fuel-gauge/src/script-main-args.test.ts rename to packages/fuel-gauge/src/script-main-args.node.e2e.test.ts diff --git a/packages/fuel-gauge/src/storage-test-contract.test.ts b/packages/fuel-gauge/src/storage-test-contract.node.e2e.test.ts similarity index 98% rename from packages/fuel-gauge/src/storage-test-contract.test.ts rename to packages/fuel-gauge/src/storage-test-contract.node.e2e.test.ts index 682fb91fcdd..4642c39db50 100644 --- a/packages/fuel-gauge/src/storage-test-contract.test.ts +++ b/packages/fuel-gauge/src/storage-test-contract.node.e2e.test.ts @@ -23,9 +23,6 @@ const setup = async () => { return contract; }; -/* - * @group node/e2e - */ describe('StorageTestContract', () => { it('can increment counter', async () => { const contract = await setup(); diff --git a/packages/fuel-gauge/src/token-test-contract.test.ts b/packages/fuel-gauge/src/token-test-contract.node.e2e.test.ts similarity index 99% rename from packages/fuel-gauge/src/token-test-contract.test.ts rename to packages/fuel-gauge/src/token-test-contract.node.e2e.test.ts index 60b00e17ac7..9ff2f85870f 100644 --- a/packages/fuel-gauge/src/token-test-contract.test.ts +++ b/packages/fuel-gauge/src/token-test-contract.node.e2e.test.ts @@ -22,9 +22,6 @@ const setup = async () => { return contract; }; -/* - * @group node/e2e - */ describe('TokenTestContract', () => { it('Can mint and transfer coins', async () => { // New wallet to transfer coins and check balance diff --git a/packages/fuels/src/cli.test.ts b/packages/fuels/src/cli.node.unit.test.ts similarity index 97% rename from packages/fuels/src/cli.test.ts rename to packages/fuels/src/cli.node.unit.test.ts index 4b01c6cdf25..7c516838311 100644 --- a/packages/fuels/src/cli.test.ts +++ b/packages/fuels/src/cli.node.unit.test.ts @@ -3,9 +3,6 @@ import { Command } from 'commander'; import { run } from './cli'; -/* - * @group node/unit - */ describe('cli.js', () => { test('should call `versions` sub-program', async () => { // mocking diff --git a/packages/fuels/src/index.test.ts b/packages/fuels/src/index.node.unit.test.ts similarity index 95% rename from packages/fuels/src/index.test.ts rename to packages/fuels/src/index.node.unit.test.ts index ae0eabacb3a..3352197fb09 100644 --- a/packages/fuels/src/index.test.ts +++ b/packages/fuels/src/index.node.unit.test.ts @@ -1,8 +1,5 @@ import * as fuels from './index'; -/* - * @group common/unit - */ describe('index.js', () => { test('should export everything', async () => { expect(fuels.AbiCoder).toBeTruthy(); diff --git a/packages/hasher/src/hasher.test.ts b/packages/hasher/src/hasher.common.unit.test.ts similarity index 96% rename from packages/hasher/src/hasher.test.ts rename to packages/hasher/src/hasher.common.unit.test.ts index 2fb98d487c7..0387a6832c6 100644 --- a/packages/hasher/src/hasher.test.ts +++ b/packages/hasher/src/hasher.common.unit.test.ts @@ -3,9 +3,6 @@ import signTransactionTest from '@fuel-ts/testcases/src/signTransaction.json'; import { hashMessage, hash, hashTransaction } from './hasher'; -/* - * @group common/unit - */ describe('Hasher', () => { it('Hash message', async () => { expect(hashMessage(signMessageTest.message)).toEqual(signMessageTest.hashedMessage); diff --git a/packages/hdwallet/src/hdwallet.test.ts b/packages/hdwallet/src/hdwallet.common.unit.test.ts similarity index 99% rename from packages/hdwallet/src/hdwallet.test.ts rename to packages/hdwallet/src/hdwallet.common.unit.test.ts index 68d333cb078..eaba02c8919 100644 --- a/packages/hdwallet/src/hdwallet.test.ts +++ b/packages/hdwallet/src/hdwallet.common.unit.test.ts @@ -1,9 +1,6 @@ import HDWallet from './hdwallet'; import HDWalletSpec from './hdwallet-spec'; -/* - * @group common/unit - */ describe('HDWallet', () => { test("Should throw error on invalid extended key's", () => { expect(() => diff --git a/packages/keystore/src/keystore.test.ts b/packages/keystore/src/keystore.common.unit.test.ts similarity index 98% rename from packages/keystore/src/keystore.test.ts rename to packages/keystore/src/keystore.common.unit.test.ts index 0a9b67763e5..fb51151405d 100644 --- a/packages/keystore/src/keystore.test.ts +++ b/packages/keystore/src/keystore.common.unit.test.ts @@ -1,8 +1,5 @@ import * as keystore from './keystore'; -/* - * @group common/unit - */ describe('Keystore', () => { test('Encrypt and Decrypt', async () => { const password = '0b540281-f87b-49ca-be37-2264c7f260f7'; diff --git a/packages/math/src/bn.test.ts b/packages/math/src/bn.common.unit.test.ts similarity index 99% rename from packages/math/src/bn.test.ts rename to packages/math/src/bn.common.unit.test.ts index 06935ab7553..7d7829aff59 100644 --- a/packages/math/src/bn.test.ts +++ b/packages/math/src/bn.common.unit.test.ts @@ -2,9 +2,6 @@ import type { BN } from './bn'; import { bn } from './bn'; import type { BigNumberish } from './types'; -/* - * @group common/unit - */ describe('Math - BN', () => { it('can execute operations without losing our BN reference', async () => { let test: BN; diff --git a/packages/math/src/functional.test.ts b/packages/math/src/functional.common.unit.test.ts similarity index 96% rename from packages/math/src/functional.test.ts rename to packages/math/src/functional.common.unit.test.ts index 0059567744d..086ebb84770 100644 --- a/packages/math/src/functional.test.ts +++ b/packages/math/src/functional.common.unit.test.ts @@ -6,9 +6,6 @@ import { format, formatUnits, toBytes, toHex, toNumber } from './functional'; -/* - * @group common/unit - */ describe('Math - Functional shortcuts', () => { it('should toNumber return a number', () => { expect(toNumber('50000')).toEqual(50000); diff --git a/packages/merkle/src/binaryMerkleTree.test.ts b/packages/merkle/src/binaryMerkleTree.common.unit.test.ts similarity index 97% rename from packages/merkle/src/binaryMerkleTree.test.ts rename to packages/merkle/src/binaryMerkleTree.common.unit.test.ts index 2c62f1694f0..afefdf2e4f9 100644 --- a/packages/merkle/src/binaryMerkleTree.test.ts +++ b/packages/merkle/src/binaryMerkleTree.common.unit.test.ts @@ -3,9 +3,6 @@ import { toHex } from '@fuel-ts/math'; import { calcRoot, constructTree, getProof } from './binaryMerkleTree'; import type Node from './types/node'; -/* - * @group common/unit - */ describe('Binary Merkle Tree', () => { const rootAfterLeaves = '0x9e59abcd7c89011ba919f9141624acb32b4cc31c24e76c6d4f64b25093ef366c'; const size = 100; diff --git a/packages/merklesum/src/sumMerkleTree.test.ts b/packages/merklesum/src/sumMerkleTree.common.unit.test.ts similarity index 100% rename from packages/merklesum/src/sumMerkleTree.test.ts rename to packages/merklesum/src/sumMerkleTree.common.unit.test.ts diff --git a/packages/mnemonic/src/mnemonic.test.ts b/packages/mnemonic/src/mnemonic.common.unit.test.ts similarity index 99% rename from packages/mnemonic/src/mnemonic.test.ts rename to packages/mnemonic/src/mnemonic.common.unit.test.ts index 2b238ef0619..afee42aafaf 100644 --- a/packages/mnemonic/src/mnemonic.test.ts +++ b/packages/mnemonic/src/mnemonic.common.unit.test.ts @@ -3,9 +3,6 @@ import { randomBytes } from '@fuel-ts/keystore'; import Mnemonic from './mnemonic'; import MnemonicSpec from './mnemonic-specs'; -/* - * @group common/unit - */ describe('Mnemonic', () => { const mnemonic = new Mnemonic(); diff --git a/packages/mnemonic/src/utils.test.ts b/packages/mnemonic/src/utils.common.unit.test.ts similarity index 94% rename from packages/mnemonic/src/utils.test.ts rename to packages/mnemonic/src/utils.common.unit.test.ts index 4b66e00aec4..9e20212f061 100644 --- a/packages/mnemonic/src/utils.test.ts +++ b/packages/mnemonic/src/utils.common.unit.test.ts @@ -1,8 +1,5 @@ import { getWords } from './utils'; -/* - * @group common/unit - */ describe('mnemonic utils', () => { const words = ['a', 'b', 'c']; diff --git a/packages/predicate/src/predicate.test.ts b/packages/predicate/src/predicate.common.e2e.test.ts similarity index 100% rename from packages/predicate/src/predicate.test.ts rename to packages/predicate/src/predicate.common.e2e.test.ts diff --git a/packages/program/src/contract.test.ts b/packages/program/src/contract.common.e2e.test.ts similarity index 98% rename from packages/program/src/contract.test.ts rename to packages/program/src/contract.common.e2e.test.ts index e25b0b5810c..7289a6c1462 100644 --- a/packages/program/src/contract.test.ts +++ b/packages/program/src/contract.common.e2e.test.ts @@ -28,9 +28,6 @@ const ABI = { loggedTypes: [], }; -/* - * @group common/e2e - */ describe('Contract', () => { test('Create contract instance with provider', async () => { const provider = new Provider('http://localhost:4000/graphql'); diff --git a/packages/providers/src/provider.test.ts b/packages/providers/src/provider.common.e2e.test.ts similarity index 99% rename from packages/providers/src/provider.test.ts rename to packages/providers/src/provider.common.e2e.test.ts index 67760ca2763..b16fc6901c7 100644 --- a/packages/providers/src/provider.test.ts +++ b/packages/providers/src/provider.common.e2e.test.ts @@ -12,9 +12,6 @@ afterEach(() => { jest.restoreAllMocks(); }); -/* - * @group common/e2e - */ describe('Provider', () => { it('can getVersion()', async () => { const provider = new Provider('http://127.0.0.1:4000/graphql'); diff --git a/packages/providers/src/utils/block-explorer.test.ts b/packages/providers/src/utils/block-explorer.common.unit.test.ts similarity index 100% rename from packages/providers/src/utils/block-explorer.test.ts rename to packages/providers/src/utils/block-explorer.common.unit.test.ts diff --git a/packages/script/src/script.test.ts b/packages/script/src/script.common.e2e.test.ts similarity index 99% rename from packages/script/src/script.test.ts rename to packages/script/src/script.common.e2e.test.ts index 03f675342ce..30d64beb2c8 100644 --- a/packages/script/src/script.test.ts +++ b/packages/script/src/script.common.e2e.test.ts @@ -105,9 +105,6 @@ type MyStruct = { arg_two: BigNumberish; }; -/* - * @group common/e2e - */ describe('Script', () => { let script: ScriptRequest; beforeAll(async () => { diff --git a/packages/signer/src/signer.test.ts b/packages/signer/src/signer.common.unit.test.ts similarity index 98% rename from packages/signer/src/signer.test.ts rename to packages/signer/src/signer.common.unit.test.ts index cf42de6a264..12b9cbbaaf2 100644 --- a/packages/signer/src/signer.test.ts +++ b/packages/signer/src/signer.common.unit.test.ts @@ -4,9 +4,6 @@ import signMessageTest from '@fuel-ts/testcases/src/signMessage.json'; import Signer from './signer'; -/* - * @group common/unit - */ describe('Signer', () => { it('Initialize publicKey and address for new signer instance', async () => { const signer = new Signer(signMessageTest.privateKey); diff --git a/packages/sparsemerkle/src/sparseMerkleTree.test.ts b/packages/sparsemerkle/src/sparseMerkleTree.common.unit.test.ts similarity index 99% rename from packages/sparsemerkle/src/sparseMerkleTree.test.ts rename to packages/sparsemerkle/src/sparseMerkleTree.common.unit.test.ts index 39f337945c2..de1d38606fd 100644 --- a/packages/sparsemerkle/src/sparseMerkleTree.test.ts +++ b/packages/sparsemerkle/src/sparseMerkleTree.common.unit.test.ts @@ -4,9 +4,6 @@ import { hash } from '@fuel-ts/merkle-shared'; import DeepSparseMerkleSubTree from './deepSparseMerkleSubTree'; import SparseMerkleTree from './sparseMerkleTree'; -/* - * @group common/unit - */ describe('Sparse Merkle Tree', () => { it('Update and delete', async () => { const smt = new SparseMerkleTree(); diff --git a/packages/transactions/src/coders/byte-array.test.ts b/packages/transactions/src/coders/byte-array.common.unit.test.ts similarity index 96% rename from packages/transactions/src/coders/byte-array.test.ts rename to packages/transactions/src/coders/byte-array.common.unit.test.ts index 056f308d130..faf2f07cc42 100644 --- a/packages/transactions/src/coders/byte-array.test.ts +++ b/packages/transactions/src/coders/byte-array.common.unit.test.ts @@ -2,9 +2,6 @@ import { arrayify, hexlify } from '@ethersproject/bytes'; import { ByteArrayCoder } from './byte-array'; -/* - * @group common/unit - */ describe('ByteArrayCoder', () => { it('Can encode empty byte[]', () => { const bytes = arrayify('0x'); diff --git a/packages/transactions/src/coders/input.test.ts b/packages/transactions/src/coders/input.common.unit.test.ts similarity index 99% rename from packages/transactions/src/coders/input.test.ts rename to packages/transactions/src/coders/input.common.unit.test.ts index 141a7a4aab4..9d58f1eb338 100644 --- a/packages/transactions/src/coders/input.test.ts +++ b/packages/transactions/src/coders/input.common.unit.test.ts @@ -6,9 +6,6 @@ import { InputMessageCoder, InputCoder, InputType } from './input'; const B256 = '0xd5579c46dfcc7f18207013e65b44e4cb4e2c2298f4ac457ba8f82743f31e930b'; -/* - * @group common/unit - */ describe('InputCoder', () => { it('Can encode Coin', () => { const input: Input = { diff --git a/packages/transactions/src/coders/output.test.ts b/packages/transactions/src/coders/output.common.unit.test.ts similarity index 99% rename from packages/transactions/src/coders/output.test.ts rename to packages/transactions/src/coders/output.common.unit.test.ts index 45444779973..1245d5154cd 100644 --- a/packages/transactions/src/coders/output.test.ts +++ b/packages/transactions/src/coders/output.common.unit.test.ts @@ -6,9 +6,6 @@ import { OutputCoder, OutputType } from './output'; const B256 = '0xd5579c46dfcc7f18207013e65b44e4cb4e2c2298f4ac457ba8f82743f31e930b'; -/* - * @group common/unit - */ describe('OutputCoder', () => { it('Can encode Coin', () => { const output: Output = { diff --git a/packages/transactions/src/coders/receipt.test.ts b/packages/transactions/src/coders/receipt.common.unit.test.ts similarity index 99% rename from packages/transactions/src/coders/receipt.test.ts rename to packages/transactions/src/coders/receipt.common.unit.test.ts index 8ba311d1b3d..32cd2dcc1d1 100644 --- a/packages/transactions/src/coders/receipt.test.ts +++ b/packages/transactions/src/coders/receipt.common.unit.test.ts @@ -10,9 +10,6 @@ const B256_ALT2 = '0x68b401b682ba0c9018150cca596358a6b98576337ea10b9cfb0d02441b3 const B256_ALT3 = '0xeb03488970d05ea240c788a0ea2e07176cc5317b7c7c89f26ac5282bbcd445bd'; const B256_ALT4 = '0x2f6d40e3ac1a172fb9445f9843440a0fc383bea238a7a35a77a3c73d36902992'; -/* - * @group common/unit - */ describe('ReceiptCoder', () => { it('Can encode Call', () => { const receipt: Receipt = { diff --git a/packages/transactions/src/coders/storage-slot.test.ts b/packages/transactions/src/coders/storage-slot.common.unit.test.ts similarity index 96% rename from packages/transactions/src/coders/storage-slot.test.ts rename to packages/transactions/src/coders/storage-slot.common.unit.test.ts index fdcc804fb19..16a0f7022f2 100644 --- a/packages/transactions/src/coders/storage-slot.test.ts +++ b/packages/transactions/src/coders/storage-slot.common.unit.test.ts @@ -4,9 +4,6 @@ import { ZeroBytes32 } from '@fuel-ts/constants'; import type { StorageSlot } from './storage-slot'; import { StorageSlotCoder } from './storage-slot'; -/* - * @group common/unit - */ describe('StorageSlotCoder', () => { it('Can encode and decode', () => { const storageSlot: StorageSlot = { diff --git a/packages/transactions/src/coders/transaction.test.ts b/packages/transactions/src/coders/transaction.common.unit.test.ts similarity index 99% rename from packages/transactions/src/coders/transaction.test.ts rename to packages/transactions/src/coders/transaction.common.unit.test.ts index f15061f71f9..53de24f9193 100644 --- a/packages/transactions/src/coders/transaction.test.ts +++ b/packages/transactions/src/coders/transaction.common.unit.test.ts @@ -11,9 +11,6 @@ const U32 = 1000; const U16 = 32; const U8 = 1; -/* - * @group common/unit - */ describe('TransactionCoder', () => { it('Can encode/decode TransactionScript without inputs, outputs and witnesses', () => { const transaction: Transaction = { diff --git a/packages/transactions/src/coders/tx-pointer.test.ts b/packages/transactions/src/coders/tx-pointer.common.unit.test.ts similarity index 97% rename from packages/transactions/src/coders/tx-pointer.test.ts rename to packages/transactions/src/coders/tx-pointer.common.unit.test.ts index 896d869ad93..58d4ff0ed76 100644 --- a/packages/transactions/src/coders/tx-pointer.test.ts +++ b/packages/transactions/src/coders/tx-pointer.common.unit.test.ts @@ -5,9 +5,6 @@ import { TxPointerCoder } from './tx-pointer'; const B256 = '0xd5579c46dfcc7f18207013e65b44e4cb4e2c2298f4ac457ba8f82743f31e930b'; -/* - * @group common/unit - */ describe('TxPointerCoder', () => { it('can encode TxPointer', () => { const txPointer: TxPointer = { diff --git a/packages/transactions/src/coders/utxo-id.test.ts b/packages/transactions/src/coders/utxo-id.common.unit.test.ts similarity index 97% rename from packages/transactions/src/coders/utxo-id.test.ts rename to packages/transactions/src/coders/utxo-id.common.unit.test.ts index 606f8d354ab..31d5c31ba31 100644 --- a/packages/transactions/src/coders/utxo-id.test.ts +++ b/packages/transactions/src/coders/utxo-id.common.unit.test.ts @@ -5,9 +5,6 @@ import { UtxoIdCoder } from './utxo-id'; const B256 = '0xd5579c46dfcc7f18207013e65b44e4cb4e2c2298f4ac457ba8f82743f31e930b'; -/* - * @group common/unit - */ describe('UtxoIdCoder', () => { it('can encode UtxoId', () => { const utxoId: UtxoId = { diff --git a/packages/transactions/src/coders/witness.test.ts b/packages/transactions/src/coders/witness.common.unit.test.ts similarity index 97% rename from packages/transactions/src/coders/witness.test.ts rename to packages/transactions/src/coders/witness.common.unit.test.ts index 8a2ab832a81..201a50f4269 100644 --- a/packages/transactions/src/coders/witness.test.ts +++ b/packages/transactions/src/coders/witness.common.unit.test.ts @@ -3,9 +3,6 @@ import { arrayify, hexlify } from '@ethersproject/bytes'; import type { Witness } from './witness'; import { WitnessCoder } from './witness'; -/* - * @group common/unit - */ describe('WitnessCoder', () => { it('Can encode empty Witness', () => { const witness: Witness = { diff --git a/packages/versions/src/cli.test.ts b/packages/versions/src/cli.node.unit.test.ts similarity index 99% rename from packages/versions/src/cli.test.ts rename to packages/versions/src/cli.node.unit.test.ts index d4e5eed0dd9..d7c1036c2d4 100644 --- a/packages/versions/src/cli.test.ts +++ b/packages/versions/src/cli.node.unit.test.ts @@ -4,9 +4,6 @@ import * as compareUserVersionsMod from './lib/compareUserVersions'; import * as getSupportedVersionsMod from './lib/getSupportedVersions'; import * as getUserVersionsMod from './lib/getUserVersions'; -/* - * @group node/unit - */ describe('cli.js', () => { // hooks beforeEach(jest.clearAllMocks); diff --git a/packages/versions/src/index.test.ts b/packages/versions/src/index.common.unit.test.ts similarity index 85% rename from packages/versions/src/index.test.ts rename to packages/versions/src/index.common.unit.test.ts index a7c9bcd7657..e13e1af6dec 100644 --- a/packages/versions/src/index.test.ts +++ b/packages/versions/src/index.common.unit.test.ts @@ -1,8 +1,5 @@ import * as indexMod from './index'; -/* - * @group common/unit - */ describe('index.js', () => { test('should export versions constant', async () => { expect(indexMod.versions).toBeTruthy(); diff --git a/packages/versions/src/lib/colorizeUserVersion.test.ts b/packages/versions/src/lib/colorizeUserVersion.node.unit.test.ts similarity index 96% rename from packages/versions/src/lib/colorizeUserVersion.test.ts rename to packages/versions/src/lib/colorizeUserVersion.node.unit.test.ts index 499bf9eaa93..19865160dbf 100644 --- a/packages/versions/src/lib/colorizeUserVersion.test.ts +++ b/packages/versions/src/lib/colorizeUserVersion.node.unit.test.ts @@ -2,9 +2,6 @@ import { cyan, red, green } from 'chalk'; import { colorizeUserVersion } from './colorizeUserVersion'; -/* - * @group node/unit - */ describe('colorizeUserVersion.js', () => { test('should colorize user versions just fine', async () => { const version = '1.0.0'; diff --git a/packages/versions/src/lib/compareUserVersions.test.ts b/packages/versions/src/lib/compareUserVersions.node.unit.test.ts similarity index 98% rename from packages/versions/src/lib/compareUserVersions.test.ts rename to packages/versions/src/lib/compareUserVersions.node.unit.test.ts index e03d8c0a145..649c7dd3be7 100644 --- a/packages/versions/src/lib/compareUserVersions.test.ts +++ b/packages/versions/src/lib/compareUserVersions.node.unit.test.ts @@ -1,9 +1,6 @@ import { compareUserVersions } from './compareUserVersions'; import * as getSupportedVersionsMod from './getSupportedVersions'; -/* - * @group node/unit - */ describe('compareVersions.js', () => { /* Hooks diff --git a/packages/versions/src/lib/getSupportedVersions.test.ts b/packages/versions/src/lib/getSupportedVersions.node.unit.test.ts similarity index 97% rename from packages/versions/src/lib/getSupportedVersions.test.ts rename to packages/versions/src/lib/getSupportedVersions.node.unit.test.ts index af4880532a1..f166c77bd04 100644 --- a/packages/versions/src/lib/getSupportedVersions.test.ts +++ b/packages/versions/src/lib/getSupportedVersions.node.unit.test.ts @@ -1,8 +1,5 @@ import { getSupportedVersions, thisVersionOrDefault } from './getSupportedVersions'; -/* - * @group node/unit - */ describe('getSupportedVersions.js', () => { test('should return received version of default', async () => { expect(thisVersionOrDefault()).toEqual('0.0.0'); diff --git a/packages/versions/src/lib/getUserVersions.test.ts b/packages/versions/src/lib/getUserVersions.node.unit.test.ts similarity index 98% rename from packages/versions/src/lib/getUserVersions.test.ts rename to packages/versions/src/lib/getUserVersions.node.unit.test.ts index 6576571fe54..6bddc1dfad6 100644 --- a/packages/versions/src/lib/getUserVersions.test.ts +++ b/packages/versions/src/lib/getUserVersions.node.unit.test.ts @@ -2,9 +2,6 @@ import * as execSyncProxyMod from '../proxies/execSync'; import { getUserVersions } from './getUserVersions'; -/* - * @group node/unit - */ describe('getUserVersions.js', () => { /* Test (mocking) utility diff --git a/packages/wallet-manager/src/storages/memory-storage.test.ts b/packages/wallet-manager/src/storages/memory-storage.common.unit.test.ts similarity index 95% rename from packages/wallet-manager/src/storages/memory-storage.test.ts rename to packages/wallet-manager/src/storages/memory-storage.common.unit.test.ts index 99e2e5efec1..77e64a640bb 100644 --- a/packages/wallet-manager/src/storages/memory-storage.test.ts +++ b/packages/wallet-manager/src/storages/memory-storage.common.unit.test.ts @@ -1,8 +1,5 @@ import MemoryStorage from './memory-storage'; -/* - * @group common/unit - */ describe('MemoryStorage', () => { it('Test storage operations', async () => { const storage = new MemoryStorage(); diff --git a/packages/wallet-manager/src/vaults/mnemonic-vault.test.ts b/packages/wallet-manager/src/vaults/mnemonic-vault.common.unit.test.ts similarity index 98% rename from packages/wallet-manager/src/vaults/mnemonic-vault.test.ts rename to packages/wallet-manager/src/vaults/mnemonic-vault.common.unit.test.ts index 4cfbe7a88f3..91deef44e84 100644 --- a/packages/wallet-manager/src/vaults/mnemonic-vault.test.ts +++ b/packages/wallet-manager/src/vaults/mnemonic-vault.common.unit.test.ts @@ -4,9 +4,6 @@ import walletManagerSpec from '../wallet-manager-spec'; import { MnemonicVault } from './mnemonic-vault'; -/* - * @group common/unit - */ describe('MnemonicVault', () => { it('Get wallet instance', async () => { const vault = new MnemonicVault({ diff --git a/packages/wallet-manager/src/vaults/privatekey-vault.test.ts b/packages/wallet-manager/src/vaults/privatekey-vault.common.unit.test.ts similarity index 98% rename from packages/wallet-manager/src/vaults/privatekey-vault.test.ts rename to packages/wallet-manager/src/vaults/privatekey-vault.common.unit.test.ts index 38f72adac27..de840376a76 100644 --- a/packages/wallet-manager/src/vaults/privatekey-vault.test.ts +++ b/packages/wallet-manager/src/vaults/privatekey-vault.common.unit.test.ts @@ -2,9 +2,6 @@ import { Wallet } from '@fuel-ts/wallet'; import { PrivateKeyVault } from './privatekey-vault'; -/* - * @group common/unit - */ describe('PrivateKeyVault', () => { const walletSpec = Wallet.generate(); diff --git a/packages/wallet-manager/src/wallet-manager.test.ts b/packages/wallet-manager/src/wallet-manager.common.unit.test.ts similarity index 99% rename from packages/wallet-manager/src/wallet-manager.test.ts rename to packages/wallet-manager/src/wallet-manager.common.unit.test.ts index fec2249e985..4cd0b11c6c9 100644 --- a/packages/wallet-manager/src/wallet-manager.test.ts +++ b/packages/wallet-manager/src/wallet-manager.common.unit.test.ts @@ -8,9 +8,6 @@ import type { VaultConfig } from './types'; import { WalletManager } from './wallet-manager'; import WalletManagerSpec from './wallet-manager-spec'; -/* - * @group common/unit - */ describe('Wallet Manager', () => { const setupWallet = async (config: VaultConfig) => { // #region typedoc:wallet-manager-mnemonic diff --git a/packages/wallet/src/account.test.ts b/packages/wallet/src/account.common.e2e.test.ts similarity index 99% rename from packages/wallet/src/account.test.ts rename to packages/wallet/src/account.common.e2e.test.ts index 45e7695c72f..f868885979e 100644 --- a/packages/wallet/src/account.test.ts +++ b/packages/wallet/src/account.common.e2e.test.ts @@ -19,9 +19,6 @@ import { Account } from './account'; afterEach(jest.restoreAllMocks); -/* - * @group common/e2e - */ describe('Account', () => { const assets = [ '0x0101010101010101010101010101010101010101010101010101010101010101', diff --git a/packages/wallet/src/transfer.test.ts b/packages/wallet/src/transfer.common.e2e.test.ts similarity index 99% rename from packages/wallet/src/transfer.test.ts rename to packages/wallet/src/transfer.common.e2e.test.ts index a5e60bc1274..285a11d7967 100644 --- a/packages/wallet/src/transfer.test.ts +++ b/packages/wallet/src/transfer.common.e2e.test.ts @@ -8,9 +8,6 @@ import { seedTestWallet, generateTestWallet } from '../test/utils'; import { Wallet } from '.'; -/* - * @group common/e2e - */ describe('Wallet', () => { it('can transfer a single type of coin to a single destination', async () => { // #region typedoc:wallet-transfer diff --git a/packages/wallet/src/wallet-unlocked.test.ts b/packages/wallet/src/wallet-unlocked.common.e2e.test.ts similarity index 99% rename from packages/wallet/src/wallet-unlocked.test.ts rename to packages/wallet/src/wallet-unlocked.common.e2e.test.ts index 178c3083445..bff3857d050 100644 --- a/packages/wallet/src/wallet-unlocked.test.ts +++ b/packages/wallet/src/wallet-unlocked.common.e2e.test.ts @@ -14,9 +14,6 @@ import { BaseWalletUnlocked } from './base-unlocked-wallet'; import walletSpec from './wallet-spec'; import { WalletLocked, WalletUnlocked } from './wallets'; -/* - * @group common/e2e - */ describe('WalletUnlocked', () => { it('Instantiate a new wallet', async () => { const wallet = new WalletUnlocked(signMessageTest.privateKey); diff --git a/packages/wallet/src/wallet.test.ts b/packages/wallet/src/wallet.common.e2e.test.ts similarity index 99% rename from packages/wallet/src/wallet.test.ts rename to packages/wallet/src/wallet.common.e2e.test.ts index 9ca01ff76fe..b0934f54b0f 100644 --- a/packages/wallet/src/wallet.test.ts +++ b/packages/wallet/src/wallet.common.e2e.test.ts @@ -9,9 +9,6 @@ import { FUEL_NETWORK_URL } from './constants'; import { Wallet } from './wallet'; import type { WalletUnlocked } from './wallets'; -/* - * @group common/e2e - */ describe('Wallet', () => { let wallet: WalletUnlocked; diff --git a/packages/wordlists/src/wordlists.test.ts b/packages/wordlists/src/wordlists.common.unit.test.ts similarity index 93% rename from packages/wordlists/src/wordlists.test.ts rename to packages/wordlists/src/wordlists.common.unit.test.ts index e4d5a0e486d..ca98da15298 100644 --- a/packages/wordlists/src/wordlists.test.ts +++ b/packages/wordlists/src/wordlists.common.unit.test.ts @@ -2,9 +2,6 @@ import { createHash } from 'crypto'; import { english } from './words/english'; -/* - * @group common/unit - */ const checksum = (wordlists: string[]) => createHash('sha256') .update(Buffer.from(`${wordlists.join('\n')}\n`)) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index baf54a2bc9f..e3d0ebffe81 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -33,7 +33,6 @@ importers: forc-bin: workspace:* husky: ^8.0.3 jest: ^29.3.1 - jest-runner-groups: ^2.2.0 jest-text-transformer: ^1.0.4 markdownlint: ^0.23.1 markdownlint-cli: ^0.27.1 @@ -82,7 +81,6 @@ importers: forc-bin: link:packages/forc-bin husky: 8.0.3 jest: 29.3.1_t5wpzltkkzdw6ng6jmtbqvsf2q - jest-runner-groups: 2.2.0_qrt5due4lpwhtnujr3g74bqrki jest-text-transformer: 1.0.4 markdownlint: 0.23.1 markdownlint-cli: 0.27.1 @@ -6432,17 +6430,6 @@ packages: slash: 3.0.0 dev: true - /jest-runner-groups/2.2.0_qrt5due4lpwhtnujr3g74bqrki: - resolution: {integrity: sha512-Sp/B9ZX0CDAKa9dIkgH0sGyl2eDuScV4SVvOxqhBMxqWpsNAkmol/C58aTFmPWZj+C0ZTW1r1BSu66MTCN+voA==} - engines: {node: '>= 10.14.2'} - peerDependencies: - jest-docblock: '>= 24' - jest-runner: '>= 24' - dependencies: - jest-docblock: 29.2.0 - jest-runner: 29.3.1 - dev: true - /jest-runner/29.3.1: resolution: {integrity: sha512-oFvcwRNrKMtE6u9+AQPMATxFcTySyKfLhvso7Sdk/rNpbhg4g2GAGCopiInk1OP4q6gz3n6MajW4+fnHWlU3bA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} From 863f6368adde9a66632883c669067275729c3b96 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Mon, 6 Mar 2023 20:42:56 +0530 Subject: [PATCH 42/47] rename test file --- ...mple-contract.test.ts => example-contract.node.e2e.test.ts} | 3 --- 1 file changed, 3 deletions(-) rename packages/example-contract/src/{example-contract.test.ts => example-contract.node.e2e.test.ts} (97%) diff --git a/packages/example-contract/src/example-contract.test.ts b/packages/example-contract/src/example-contract.node.e2e.test.ts similarity index 97% rename from packages/example-contract/src/example-contract.test.ts rename to packages/example-contract/src/example-contract.node.e2e.test.ts index 0f6a94b19b5..09af8d989db 100644 --- a/packages/example-contract/src/example-contract.test.ts +++ b/packages/example-contract/src/example-contract.node.e2e.test.ts @@ -6,9 +6,6 @@ import path from 'path'; import { ExampleContractAbi__factory } from './example-contract-types'; -/* - * @group node/e2e - */ describe('ExampleContract', () => { it('should return the input', async () => { const provider = new Provider('http://127.0.0.1:4000/graphql'); From 4f32fa54ac61cdde1b41f666fc72040825845881 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Mon, 6 Mar 2023 20:52:38 +0530 Subject: [PATCH 43/47] remove `--group` --- .github/actions/test-setup/action.yaml | 0 .github/workflows/node-e2e-tests.yaml | 2 +- .github/workflows/node-unit-tests.yaml | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 .github/actions/test-setup/action.yaml diff --git a/.github/actions/test-setup/action.yaml b/.github/actions/test-setup/action.yaml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/.github/workflows/node-e2e-tests.yaml b/.github/workflows/node-e2e-tests.yaml index 17e571a6984..f6df42244b2 100644 --- a/.github/workflows/node-e2e-tests.yaml +++ b/.github/workflows/node-e2e-tests.yaml @@ -32,7 +32,7 @@ jobs: run: pnpm services:run - name: Node e2e tests - run: pnpm test -- **/*.node.e2e.test.ts --group=common/e2e --coverage + run: pnpm test -- **/*.node.e2e.test.ts --coverage - name: Upload coverage to Github artifacts uses: actions/upload-artifact@v2 diff --git a/.github/workflows/node-unit-tests.yaml b/.github/workflows/node-unit-tests.yaml index 7f993016a39..9e5f80c11df 100644 --- a/.github/workflows/node-unit-tests.yaml +++ b/.github/workflows/node-unit-tests.yaml @@ -29,7 +29,7 @@ jobs: BUILD_VERSION="0.0.0-${{ github.ref_name }}-$(git rev-parse --short $GITHUB_SHA)" pnpm build - name: Node unit tests - run: pnpm test -- **/*.node.unit.test.ts --group=common/unit --coverage + run: pnpm test -- **/*.node.unit.test.ts --coverage - name: Upload coverage to Github artifacts uses: actions/upload-artifact@v2 From 1a797368060b937fb652c4d8a0020a3eb507facb Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Mon, 6 Mar 2023 21:06:35 +0530 Subject: [PATCH 44/47] change patterns --- .github/workflows/browser-e2e-tests.yaml | 2 +- .github/workflows/browser-unit-tests.yaml | 2 +- .github/workflows/node-e2e-tests.yaml | 2 +- .github/workflows/node-unit-tests.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/browser-e2e-tests.yaml b/.github/workflows/browser-e2e-tests.yaml index 37912ee94f7..609b1b2242c 100644 --- a/.github/workflows/browser-e2e-tests.yaml +++ b/.github/workflows/browser-e2e-tests.yaml @@ -32,7 +32,7 @@ jobs: run: pnpm services:run - name: Browser e2e tests - run: pnpm test -- **/*.common.e2e.test.ts --setupFilesAfterEnv=./setup-puppeteer.ts --testTimeout=30000 --coverage + run: pnpm test -- ./**/*.common.e2e.test.ts --setupFilesAfterEnv=./setup-puppeteer.ts --testTimeout=30000 --coverage - name: Upload coverage to Github artifacts uses: actions/upload-artifact@v2 diff --git a/.github/workflows/browser-unit-tests.yaml b/.github/workflows/browser-unit-tests.yaml index 6e9aa7d5a51..434608c2920 100644 --- a/.github/workflows/browser-unit-tests.yaml +++ b/.github/workflows/browser-unit-tests.yaml @@ -29,7 +29,7 @@ jobs: BUILD_VERSION="0.0.0-${{ github.ref_name }}-$(git rev-parse --short $GITHUB_SHA)" pnpm build - name: Browser unit tests - run: pnpm test -- **/*.common.unit.test.ts --setupFilesAfterEnv=./setup-puppeteer.ts --testTimeout=30000 --coverage + run: pnpm test -- ./**/*.common.unit.test.ts --setupFilesAfterEnv=./setup-puppeteer.ts --testTimeout=30000 --coverage - name: Upload coverage to Github artifacts uses: actions/upload-artifact@v2 diff --git a/.github/workflows/node-e2e-tests.yaml b/.github/workflows/node-e2e-tests.yaml index f6df42244b2..417be993d5c 100644 --- a/.github/workflows/node-e2e-tests.yaml +++ b/.github/workflows/node-e2e-tests.yaml @@ -32,7 +32,7 @@ jobs: run: pnpm services:run - name: Node e2e tests - run: pnpm test -- **/*.node.e2e.test.ts --coverage + run: pnpm test -- ./**/*.node.e2e.test.ts --coverage - name: Upload coverage to Github artifacts uses: actions/upload-artifact@v2 diff --git a/.github/workflows/node-unit-tests.yaml b/.github/workflows/node-unit-tests.yaml index 9e5f80c11df..9ab23359534 100644 --- a/.github/workflows/node-unit-tests.yaml +++ b/.github/workflows/node-unit-tests.yaml @@ -29,7 +29,7 @@ jobs: BUILD_VERSION="0.0.0-${{ github.ref_name }}-$(git rev-parse --short $GITHUB_SHA)" pnpm build - name: Node unit tests - run: pnpm test -- **/*.node.unit.test.ts --coverage + run: pnpm test -- ./**/*.node.unit.test.ts --coverage - name: Upload coverage to Github artifacts uses: actions/upload-artifact@v2 From 0b1086a2bda177e430a4cb37402caa9575eac22a Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Mon, 6 Mar 2023 21:13:14 +0530 Subject: [PATCH 45/47] try `npx jest` instead of `pnpm test` --- .github/workflows/browser-e2e-tests.yaml | 2 +- .github/workflows/browser-unit-tests.yaml | 2 +- .github/workflows/node-e2e-tests.yaml | 2 +- .github/workflows/node-unit-tests.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/browser-e2e-tests.yaml b/.github/workflows/browser-e2e-tests.yaml index 609b1b2242c..20c17421246 100644 --- a/.github/workflows/browser-e2e-tests.yaml +++ b/.github/workflows/browser-e2e-tests.yaml @@ -32,7 +32,7 @@ jobs: run: pnpm services:run - name: Browser e2e tests - run: pnpm test -- ./**/*.common.e2e.test.ts --setupFilesAfterEnv=./setup-puppeteer.ts --testTimeout=30000 --coverage + run: npx jest -- ./**/*.common.e2e.test.ts --setupFilesAfterEnv=./setup-puppeteer.ts --testTimeout=30000 --coverage - name: Upload coverage to Github artifacts uses: actions/upload-artifact@v2 diff --git a/.github/workflows/browser-unit-tests.yaml b/.github/workflows/browser-unit-tests.yaml index 434608c2920..739765feed6 100644 --- a/.github/workflows/browser-unit-tests.yaml +++ b/.github/workflows/browser-unit-tests.yaml @@ -29,7 +29,7 @@ jobs: BUILD_VERSION="0.0.0-${{ github.ref_name }}-$(git rev-parse --short $GITHUB_SHA)" pnpm build - name: Browser unit tests - run: pnpm test -- ./**/*.common.unit.test.ts --setupFilesAfterEnv=./setup-puppeteer.ts --testTimeout=30000 --coverage + run: npx jest -- ./**/*.common.unit.test.ts --setupFilesAfterEnv=./setup-puppeteer.ts --testTimeout=30000 --coverage - name: Upload coverage to Github artifacts uses: actions/upload-artifact@v2 diff --git a/.github/workflows/node-e2e-tests.yaml b/.github/workflows/node-e2e-tests.yaml index 417be993d5c..d01ee76288d 100644 --- a/.github/workflows/node-e2e-tests.yaml +++ b/.github/workflows/node-e2e-tests.yaml @@ -32,7 +32,7 @@ jobs: run: pnpm services:run - name: Node e2e tests - run: pnpm test -- ./**/*.node.e2e.test.ts --coverage + run: npx jest -- ./**/*.node.e2e.test.ts --coverage - name: Upload coverage to Github artifacts uses: actions/upload-artifact@v2 diff --git a/.github/workflows/node-unit-tests.yaml b/.github/workflows/node-unit-tests.yaml index 9ab23359534..0a8c8190158 100644 --- a/.github/workflows/node-unit-tests.yaml +++ b/.github/workflows/node-unit-tests.yaml @@ -29,7 +29,7 @@ jobs: BUILD_VERSION="0.0.0-${{ github.ref_name }}-$(git rev-parse --short $GITHUB_SHA)" pnpm build - name: Node unit tests - run: pnpm test -- ./**/*.node.unit.test.ts --coverage + run: npx jest -- ./**/*.node.unit.test.ts --coverage - name: Upload coverage to Github artifacts uses: actions/upload-artifact@v2 From 7ac4759cf480ee019762fdfef62984749afafe65 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Mon, 6 Mar 2023 21:35:21 +0530 Subject: [PATCH 46/47] update patterns --- .github/workflows/browser-e2e-tests.yaml | 2 +- .github/workflows/browser-unit-tests.yaml | 2 +- .github/workflows/node-e2e-tests.yaml | 2 +- .github/workflows/node-unit-tests.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/browser-e2e-tests.yaml b/.github/workflows/browser-e2e-tests.yaml index 20c17421246..292ab353d53 100644 --- a/.github/workflows/browser-e2e-tests.yaml +++ b/.github/workflows/browser-e2e-tests.yaml @@ -32,7 +32,7 @@ jobs: run: pnpm services:run - name: Browser e2e tests - run: npx jest -- ./**/*.common.e2e.test.ts --setupFilesAfterEnv=./setup-puppeteer.ts --testTimeout=30000 --coverage + run: npx jest -- "**/*.common.e2e.test.ts" --setupFilesAfterEnv=./setup-puppeteer.ts --testTimeout=30000 --coverage - name: Upload coverage to Github artifacts uses: actions/upload-artifact@v2 diff --git a/.github/workflows/browser-unit-tests.yaml b/.github/workflows/browser-unit-tests.yaml index 739765feed6..4cf4828c4c7 100644 --- a/.github/workflows/browser-unit-tests.yaml +++ b/.github/workflows/browser-unit-tests.yaml @@ -29,7 +29,7 @@ jobs: BUILD_VERSION="0.0.0-${{ github.ref_name }}-$(git rev-parse --short $GITHUB_SHA)" pnpm build - name: Browser unit tests - run: npx jest -- ./**/*.common.unit.test.ts --setupFilesAfterEnv=./setup-puppeteer.ts --testTimeout=30000 --coverage + run: npx jest -- "**/*.common.unit.test.ts" --setupFilesAfterEnv=./setup-puppeteer.ts --testTimeout=30000 --coverage - name: Upload coverage to Github artifacts uses: actions/upload-artifact@v2 diff --git a/.github/workflows/node-e2e-tests.yaml b/.github/workflows/node-e2e-tests.yaml index d01ee76288d..667bdc5faae 100644 --- a/.github/workflows/node-e2e-tests.yaml +++ b/.github/workflows/node-e2e-tests.yaml @@ -32,7 +32,7 @@ jobs: run: pnpm services:run - name: Node e2e tests - run: npx jest -- ./**/*.node.e2e.test.ts --coverage + run: npx jest -- "**/*.node.e2e.test.ts" --coverage - name: Upload coverage to Github artifacts uses: actions/upload-artifact@v2 diff --git a/.github/workflows/node-unit-tests.yaml b/.github/workflows/node-unit-tests.yaml index 0a8c8190158..21e0092c02e 100644 --- a/.github/workflows/node-unit-tests.yaml +++ b/.github/workflows/node-unit-tests.yaml @@ -29,7 +29,7 @@ jobs: BUILD_VERSION="0.0.0-${{ github.ref_name }}-$(git rev-parse --short $GITHUB_SHA)" pnpm build - name: Node unit tests - run: npx jest -- ./**/*.node.unit.test.ts --coverage + run: npx jest -- "**/*.node.unit.test.ts" --coverage - name: Upload coverage to Github artifacts uses: actions/upload-artifact@v2 From 5e7427c23bd8bca125b2a1009f4ab34ae8405b25 Mon Sep 17 00:00:00 2001 From: "Dhaiwat / dhai.eth" Date: Mon, 6 Mar 2023 21:57:11 +0530 Subject: [PATCH 47/47] Update sumMerkleTree.common.unit.test.ts --- packages/merklesum/src/sumMerkleTree.common.unit.test.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/merklesum/src/sumMerkleTree.common.unit.test.ts b/packages/merklesum/src/sumMerkleTree.common.unit.test.ts index b200f0a76f5..910d37864e5 100644 --- a/packages/merklesum/src/sumMerkleTree.common.unit.test.ts +++ b/packages/merklesum/src/sumMerkleTree.common.unit.test.ts @@ -3,9 +3,6 @@ import { toHex } from '@fuel-ts/math'; import { calcRoot, constructTree, getProof } from './sumMerkleTree'; import Proof from './types/proof'; -/* - * @group common/unit - */ describe('Sum Merkle Tree', () => { const size = 100; const sumAfterLeaves = toHex(((size - 1) * size) / 2);