Skip to content

Commit 28b8718

Browse files
test(NODE-7187): Migrate test/integration/transactions tests (#4686)
1 parent 7164da8 commit 28b8718

File tree

2 files changed

+21
-30
lines changed

2 files changed

+21
-30
lines changed

test/integration/transactions/transactions.prose.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import { type ObjectId } from 'bson';
12
import { expect } from 'chai';
23

3-
import { type MongoClient, type ObjectId } from '../../mongodb';
4+
import { type MongoClient } from '../../../src/mongo_client';
45

56
const metadata: MongoDBMetadataUI = {
67
requires: {

test/integration/transactions/transactions.test.ts

Lines changed: 19 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
import { expect } from 'chai';
22

3-
import {
4-
ClientSession,
5-
type Collection,
6-
type CommandStartedEvent,
7-
type MongoClient,
8-
MongoInvalidArgumentError,
9-
MongoNetworkError,
10-
type ServerSessionPool
11-
} from '../../mongodb';
3+
import { type CommandStartedEvent } from '../../../src/cmap/command_monitoring_events';
4+
import { type Collection } from '../../../src/collection';
5+
import { MongoInvalidArgumentError, MongoNetworkError } from '../../../src/error';
6+
import { type MongoClient } from '../../../src/mongo_client';
7+
import { ClientSession, type ServerSessionPool } from '../../../src/sessions';
128
import { type FailCommandFailPoint } from '../../tools/utils';
139

1410
describe('Transactions', function () {
@@ -55,18 +51,14 @@ describe('Transactions', function () {
5551
metadata: {
5652
requires: { topology: ['replicaset', 'sharded'] }
5753
},
58-
test: function (done) {
54+
test: async function () {
5955
function fnThatReturnsBadPromise() {
6056
return Promise.reject();
6157
}
6258

63-
session
64-
.withTransaction(fnThatReturnsBadPromise)
65-
.then(() => done(Error('Expected error')))
66-
.catch(err => {
67-
expect(err).to.equal(undefined);
68-
session.endSession(done);
69-
});
59+
const err = await session.withTransaction(fnThatReturnsBadPromise).catch(err => err);
60+
expect(err).to.equal(undefined);
61+
await session.endSession();
7062
}
7163
});
7264

@@ -179,23 +171,21 @@ describe('Transactions', function () {
179171
describe('startTransaction', function () {
180172
it('should not error if transactions are supported', {
181173
metadata: { requires: { topology: ['sharded'] } },
182-
test: function (done) {
174+
test: async function () {
183175
const configuration = this.configuration;
184176
const client = configuration.newClient(configuration.url());
185177

186-
client.connect(err => {
187-
expect(err).to.not.exist;
178+
await client.connect();
188179

189-
const session = client.startSession();
190-
const db = client.db(configuration.db);
191-
const coll = db.collection('transaction_error_test');
192-
coll.insertOne({ a: 1 }, err => {
193-
expect(err).to.not.exist;
194-
expect(() => session.startTransaction()).to.not.throw();
180+
const session = client.startSession();
181+
const db = client.db(configuration.db);
182+
const coll = db.collection('transaction_error_test');
183+
await coll.insertOne({ a: 1 });
184+
session.startTransaction();
195185

196-
session.abortTransaction(() => session.endSession(() => client.close(done)));
197-
});
198-
});
186+
await session.abortTransaction();
187+
await session.endSession();
188+
await client.close();
199189
}
200190
});
201191
});

0 commit comments

Comments
 (0)