Try to skip

web3 · Nov 7, 2022 · 803108a · 803108a
1 parent bac17a7
commit 803108a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 35 deletions.
diff --git a/packages/web3-eth-contract/package.json b/packages/web3-eth-contract/package.json
@@ -23,9 +23,9 @@
 		"test:watch": "npm test -- --watch",
 		"test:unit": "jest --config=./test/unit/jest.config.js",
 		"test:integration": "jest --config=./test/integration/jest.config.js --runInBand --forceExit",
-		"test:e2e:electron": "npx cypress run --headless --browser electron",
-		"test:e2e:chrome": "npx cypress run --headless --browser chrome",
-		"test:e2e:firefox": "npx cypress run --headless --browser firefox"
+		"test:e2e:electron": "npx cypress run --env grep='ignore',invert=true --headless --browser electron",
+		"test:e2e:chrome": "npx cypress run --env grep='ignore',invert=true --headless --browser chrome",
+		"test:e2e:firefox": "npx cypress run --env grep='ignore',invert=true --headless --browser firefox"
 	},
 	"dependencies": {
 		"web3-core": "^4.0.1-alpha.1",
@@ -41,6 +41,7 @@
 		"@types/jest": "^28.1.6",
 		"@typescript-eslint/eslint-plugin": "^5.30.7",
 		"@typescript-eslint/parser": "^5.30.7",
+		"cypress-select-tests": "^1.7.1",
 		"eslint": "^8.20.0",
 		"eslint-config-prettier": "^8.5.0",
 		"eslint-config-web3-base": "0.1.0",

diff --git a/packages/web3-eth-contract/test/integration/contract_defaults_extra.test.ts b/packages/web3-eth-contract/test/integration/contract_defaults_extra.test.ts
@@ -16,9 +16,9 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { ValidChains, Hardfork, TransactionReceipt } from 'web3-types';
-import * as Web3Eth from 'web3-eth';
 import { TransactionBlockTimeoutError } from 'web3-errors';
 import { ethRpcMethods } from 'web3-rpc-methods';
+import * as Web3Eth from 'web3-eth';
 import { Contract } from '../../src';
 import { GreeterBytecode, GreeterAbi } from '../shared_fixtures/build/Greeter';
 import {
@@ -32,32 +32,17 @@ import {
 type Resolve = (value?: unknown) => void;
 const MAX_32_SIGNED_INTEGER = 2147483647;
 
-try {
-	jest.mock('web3-eth', () => {
-		const original = jest.requireActual('web3-eth');
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-return
-		return {
-			...original,
-			call: jest.fn().mockImplementation(original.call),
-			sendTransaction: jest.fn().mockImplementation(original.sendTransaction),
-		};
-	});
-} catch {
-	// cypress
-}
-// cypress doesn't support mocking
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-expect-error
-describeIf(!global.Cypress)('contract defaults', () => {
-	// jest.mock('web3-rpc-methods', () => {
-	// 	const original = jest.requireActual('web3-rpc-methods');
-	// 	// eslint-disable-next-line @typescript-eslint/no-unsafe-return
-	// 	return {
-	// 		...original,
-	// 		sendTransaction: jest.fn().mockImplementation(original.sendTransaction),
-	// 	};
-	// });
+jest.mock('web3-eth', () => {
+	const original = jest.requireActual('web3-eth');
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+	return {
+		...original,
+		call: jest.fn().mockImplementation(original.call),
+		sendTransaction: jest.fn().mockImplementation(original.sendTransaction),
+	};
+});
 
+describe('contract defaults (extra)', () => {
 	let contract: Contract<typeof GreeterAbi>;
 	let deployOptions: Record<string, unknown>;
 	let sendOptions: Record<string, unknown>;
@@ -231,7 +216,7 @@ describeIf(!global.Cypress)('contract defaults', () => {
 		});
 	});
 	describeIf(isWs)('transactionBlockTimeout', () => {
-		test('should use "transactionBlockTimeout" on "instance" level', async () => {
+		it('should use "transactionBlockTimeout" on "instance" level', async () => {
 			contract = await contract.deploy(deployOptions).send(sendOptions);
 
 			expect(contract.transactionBlockTimeout).toBe(50);
@@ -243,7 +228,7 @@ describeIf(!global.Cypress)('contract defaults', () => {
 			await contract.methods.setGreeting('New Greeting').send(sendOptions);
 		});
 
-		test('should fail if transaction was not mined within `transactionBlockTimeout` blocks', async () => {
+		it('should fail if transaction was not mined within `transactionBlockTimeout` blocks', async () => {
 			contract = await contract.deploy(deployOptions).send(sendOptions);
 
 			// Make the test run faster by casing the polling to start after 2 blocks
@@ -291,7 +276,7 @@ describeIf(!global.Cypress)('contract defaults', () => {
 	});
 
 	describeIf(isWs)('blockHeaderTimeout', () => {
-		test('should use "blockHeaderTimeout" on "Contract" level', async () => {
+		it('should use "blockHeaderTimeout" on "Contract" level', async () => {
 			expect(Contract.blockHeaderTimeout).toBeUndefined();
 			const blockHeaderTimeout = 100;
 			Contract.blockHeaderTimeout = blockHeaderTimeout;
@@ -302,7 +287,7 @@ describeIf(!global.Cypress)('contract defaults', () => {
 			expect(contract.blockHeaderTimeout).toBe(blockHeaderTimeout);
 		});
 
-		test('should use "blockHeaderTimout" on "instance" level', async () => {
+		it('should use "blockHeaderTimout" on "instance" level', async () => {
 			contract = await contract.deploy(deployOptions).send(sendOptions);
 
 			expect(contract.blockHeaderTimeout).toBe(10);
@@ -345,7 +330,7 @@ describeIf(!global.Cypress)('contract defaults', () => {
 	});
 
 	describeIf(isHttp)('transactionPollingInterval', () => {
-		test('should use "transactionPollingInterval" on "Contract" level', async () => {
+		it('should use "transactionPollingInterval" on "Contract" level', async () => {
 			contract = await contract.deploy(deployOptions).send(sendOptions);
 
 			expect(Contract.transactionPollingInterval).toBeUndefined();
@@ -356,7 +341,7 @@ describeIf(!global.Cypress)('contract defaults', () => {
 			expect(contract.transactionPollingInterval).toBe(transactionPollingInterval);
 		});
 
-		test('should use "transactionPollingTimeout" on "instance" level', async () => {
+		it('should use "transactionPollingTimeout" on "instance" level', async () => {
 			contract = await contract.deploy(deployOptions).send(sendOptions);
 
 			const transactionPollingInterval = 500;