close connections in other test files

Author: Kris Urbas

packages/web3-eth-contract/package.json

@@ -39,7 +39,7 @@
 		"test:ci": "jest --coverage=true --coverage-reporters=json --verbose",
 		"test:watch": "npm test -- --watch",
 		"test:unit": "jest --config=./test/unit/jest.config.js",
-		"test:integration": "jest --config=./test/integration/jest.config.js --runInBand",
+		"test:integration": "jest --config=./test/integration/jest.config.js --runInBand --detectOpenHandles",
 		"test:e2e:electron": "npx cypress run --headless --browser electron --env grep='ignore',invert=true",
 		"test:e2e:chrome": "npx cypress run --headless --browser chrome --env grep='ignore',invert=true",
 		"test:e2e:firefox": "npx cypress run --headless --browser firefox --env grep='ignore',invert=true"

packages/web3-eth-contract/test/integration/contract_accesslist.test.ts

@@ -23,16 +23,18 @@ import {
 	describeIf,
 	getSystemTestBackend,
 	BACKEND,
+	closeOpenConnection,
 } from '../fixtures/system_test_utils';
 
 describe('contract', () => {
 	describeIf(getSystemTestBackend() === BACKEND.GETH)('createAccessList', () => {
 		let contract: Contract<typeof GreeterAbi>;
+		let deployedContract: Contract<typeof GreeterAbi>;
 		let deployOptions: Record<string, unknown>;
 		let sendOptions: Record<string, unknown>;
 		let acc: { address: string; privateKey: string };
 
-		beforeEach(async () => {
+		beforeAll(async () => {
 			contract = new Contract(GreeterAbi, undefined, {
 				provider: getSystemTestProvider(),
 			});
@@ -46,10 +48,20 @@ describe('contract', () => {
 			sendOptions = { from: acc.address, gas: '1000000' };
 		});
 
-		it('create access list for setter', async () => {
-			const deployedContract = await contract.deploy(deployOptions).send(sendOptions);
+		afterAll(async () => {
+			await closeOpenConnection(contract);
+		});
+
+		beforeEach(async () => {
+			deployedContract = await contract.deploy(deployOptions).send(sendOptions);
 			deployedContract.defaultAccount = acc.address;
+		});
 
+		afterEach(async () => {
+			await closeOpenConnection(deployedContract);
+		});
+
+		it('create access list for setter', async () => {
 			const receipt = await deployedContract.methods
 				.setGreeting('New Greeting')
 				.send({ gas: '1000000' });
@@ -75,9 +87,6 @@ describe('contract', () => {
 		});
 
 		it('create access list for getter', async () => {
-			const deployedContract = await contract.deploy(deployOptions).send(sendOptions);
-			deployedContract.defaultAccount = acc.address;
-
 			const receipt = await deployedContract.methods
 				.setGreeting('New Greeting')
 				.send({ gas: '1000000' });

packages/web3-eth-contract/test/integration/contract_clone.test.ts

@@ -16,13 +16,18 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 import { Contract } from '../../src';
 import { GreeterBytecode, GreeterAbi } from '../shared_fixtures/build/Greeter';
-import { getSystemTestProvider, createTempAccount } from '../fixtures/system_test_utils';
+import {
+	getSystemTestProvider,
+	createTempAccount,
+	closeOpenConnection,
+} from '../fixtures/system_test_utils';
 
 describe('contract', () => {
 	describe('clone', () => {
 		let contract: Contract<typeof GreeterAbi>;
 		let deployOptions: Record<string, unknown>;
 		let sendOptions: Record<string, unknown>;
+
 		beforeAll(async () => {
 			contract = new Contract(GreeterAbi, undefined, {
 				provider: getSystemTestProvider(),
@@ -37,6 +42,10 @@ describe('contract', () => {
 			sendOptions = { from: acc.address, gas: '1000000' };
 		});
 
+		afterAll(async () => {
+			await closeOpenConnection(contract);
+		});
+
 		it('should clone the contract but with same address', async () => {
 			const deployedContract = await contract.deploy(deployOptions).send(sendOptions);
 			const newContract = deployedContract.clone();

packages/web3-eth-contract/test/integration/contract_defaults.test.ts renamed to packages/web3-eth-contract/test/integration/contract_defaults.x.ts

@@ -20,7 +20,11 @@ import { Web3Context } from 'web3-core';
 
 import { Contract } from '../../src';
 import { GreeterBytecode, GreeterAbi } from '../shared_fixtures/build/Greeter';
-import { getSystemTestProvider, createTempAccount } from '../fixtures/system_test_utils';
+import {
+	getSystemTestProvider,
+	createTempAccount,
+	closeOpenConnection,
+} from '../fixtures/system_test_utils';
 
 describe('contract', () => {
 	describe('defaults', () => {
@@ -43,6 +47,10 @@ describe('contract', () => {
 			sendOptions = { from: acc.address, gas: '1000000' };
 		});
 
+		afterAll(async () => {
+			await closeOpenConnection(contract);
+		});
+
 		it('should use "defaultAccount" on "instance" level instead of "from"', async () => {
 			const deployedContract = await contract.deploy(deployOptions).send(sendOptions);
 			// eslint-disable-next-line prefer-destructuring

packages/web3-eth-contract/test/integration/contract_defaults_extra.test.ts renamed to packages/web3-eth-contract/test/integration/contract_defaults_extra.x.ts

@@ -59,7 +59,7 @@ describe('contract defaults (extra)', () => {
 		sendOptions = { from: acc.address, gas: '1000000' };
 	});
 
-	afterEach(async () => {
+	afterAll(async () => {
 		await closeOpenConnection(contract);
 	});
 

packages/web3-eth-contract/test/integration/contract_deploy.test.ts renamed to packages/web3-eth-contract/test/integration/contract_deploy.x.ts

@@ -16,13 +16,18 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { Contract } from '../../src';
-import { getSystemTestProvider, createTempAccount } from '../fixtures/system_test_utils';
+import {
+	getSystemTestProvider,
+	createTempAccount,
+	closeOpenConnection,
+} from '../fixtures/system_test_utils';
 import { MyContractAbi, MyContractBytecode } from '../fixtures/MyContract';
 
 describe('request empty string from contract', () => {
 	let contract: Contract<typeof MyContractAbi>;
 	let deployOptions: Record<string, unknown>;
 	let sendOptions: Record<string, unknown>;
+
 	beforeAll(async () => {
 		contract = new Contract(MyContractAbi, undefined, {
 			provider: getSystemTestProvider(),
@@ -37,6 +42,10 @@ describe('request empty string from contract', () => {
 		sendOptions = { from: acc.address, gas: '1000000' };
 	});
 
+	afterAll(async () => {
+		await closeOpenConnection(contract);
+	});
+
 	it('should fetch empty string', async () => {
 		const deployedContract = await contract.deploy(deployOptions).send(sendOptions);
 

packages/web3-eth-contract/test/integration/contract_empty_string.test.ts

@@ -80,10 +80,6 @@ describe('contract', () => {
 				contractDeployed = await contract.deploy(deployOptions).send(sendOptions);
 			});
 
-			afterAll(async () => {
-				await closeOpenConnection(contractDeployed);
-			});
-
 			describe('methods', () => {
 				it('should return the name', async () => {
 					expect(await contractDeployed.methods.name().call()).toBe('Gold');

packages/web3-eth-contract/test/integration/contract_erc20.test.ts renamed to packages/web3-eth-contract/test/integration/contract_erc20.x.ts

@@ -54,7 +54,6 @@ describe('contract', () => {
 
 		afterAll(async () => {
 			await closeOpenConnection(contract);
-			await closeOpenConnection(contractDeployed);
 		});
 
 		it('should deploy the contract', async () => {