Skip to content

Commit 72ceb9e

Browse files
committed
test: fix hanging test
1 parent ed1afd4 commit 72ceb9e

File tree

7 files changed

+53
-34
lines changed

7 files changed

+53
-34
lines changed

packages/bentocache/test_helpers/driver_test_suite.ts

+1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ export function registerCacheDriverTestSuite(options: {
7676
const cache2 = options.createDriver({ prefix: 'prefix' })
7777
cleanup(async () => {
7878
await cache2.clear()
79+
await cache2.disconnect()
7980
})
8081

8182
await cache2.set('key1', 'value1')

packages/bentocache/tests/drivers/knex/mysql.spec.ts

+8-6
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,18 @@ import { test } from '@japa/runner'
44
import { createKnexStore } from './helpers.js'
55
import { registerCacheDriverTestSuite } from '../../../test_helpers/driver_test_suite.js'
66

7-
const db = knex({
8-
client: 'mysql2',
9-
connection: { user: 'root', password: 'root', database: 'mysql', port: 3306 },
10-
})
11-
127
test.group('Knex | MySQL driver', (group) => {
138
registerCacheDriverTestSuite({
149
test,
1510
group,
1611
supportsMilliseconds: false,
17-
createDriver: (options) => createKnexStore({ connection: db, prefix: 'japa', ...options }),
12+
createDriver: (options) => {
13+
const db = knex({
14+
client: 'mysql2',
15+
connection: { user: 'root', password: 'root', database: 'mysql', port: 3306 },
16+
})
17+
18+
return createKnexStore({ connection: db, prefix: 'japa', ...options })
19+
},
1820
})
1921
})

packages/bentocache/tests/drivers/knex/postgres.spec.ts

+8-6
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,18 @@ import { test } from '@japa/runner'
44
import { createKnexStore } from './helpers.js'
55
import { registerCacheDriverTestSuite } from '../../../test_helpers/driver_test_suite.js'
66

7-
const db = knex({
8-
client: 'pg',
9-
connection: { user: 'postgres', password: 'postgres' },
10-
})
11-
127
test.group('Knex | MySQL driver', (group) => {
138
registerCacheDriverTestSuite({
149
test,
1510
group,
1611
supportsMilliseconds: false,
17-
createDriver: (options) => createKnexStore({ connection: db, prefix: 'japa', ...options }),
12+
createDriver: (options) => {
13+
const db = knex({
14+
client: 'pg',
15+
connection: { user: 'postgres', password: 'postgres' },
16+
})
17+
18+
return createKnexStore({ connection: db, prefix: 'japa', ...options })
19+
},
1820
})
1921
})

packages/bentocache/tests/drivers/knex/sqlite.spec.ts

+9-7
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,18 @@ import { test } from '@japa/runner'
44
import { createKnexStore } from './helpers.js'
55
import { registerCacheDriverTestSuite } from '../../../test_helpers/driver_test_suite.js'
66

7-
const db = knex({
8-
client: 'better-sqlite3',
9-
connection: { filename: ':memory:' },
10-
useNullAsDefault: true,
11-
})
12-
137
test.group('Knex | Better-sqlite3 driver', (group) => {
148
registerCacheDriverTestSuite({
159
test,
1610
group,
17-
createDriver: (options) => createKnexStore({ connection: db, prefix: 'japa', ...options }),
11+
createDriver: (options) => {
12+
const db = knex({
13+
client: 'better-sqlite3',
14+
connection: { filename: ':memory:' },
15+
useNullAsDefault: true,
16+
})
17+
18+
return createKnexStore({ connection: db, prefix: 'japa', ...options })
19+
},
1820
})
1921
})

packages/bentocache/tests/drivers/kysely/mysql.spec.ts

+9-7
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,19 @@ import { Kysely, MysqlDialect } from 'kysely'
55
import { createKyselyStore } from './helpers.js'
66
import { registerCacheDriverTestSuite } from '../../../src/test_suite.js'
77

8-
const db = new Kysely<any>({
9-
dialect: new MysqlDialect({
10-
pool: createPool({ user: 'root', password: 'root', database: 'mysql', port: 3306 }),
11-
}),
12-
})
13-
148
test.group('Kysely | Mysql driver', (group) => {
159
registerCacheDriverTestSuite({
1610
test,
1711
group,
1812
supportsMilliseconds: false,
19-
createDriver: (options) => createKyselyStore({ connection: db, prefix: 'japa', ...options }),
13+
createDriver: (options) => {
14+
const db = new Kysely<any>({
15+
dialect: new MysqlDialect({
16+
pool: createPool({ user: 'root', password: 'root', database: 'mysql', port: 3306 }),
17+
}),
18+
})
19+
20+
return createKyselyStore({ connection: db, prefix: 'japa', ...options })
21+
},
2022
})
2123
})

packages/bentocache/tests/drivers/kysely/postgres.spec.ts

+9-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@ test.group('Kysely | Postgres driver', (group) => {
1414
test,
1515
group,
1616
supportsMilliseconds: false,
17-
createDriver: (options) => createKyselyStore({ connection: db, prefix: 'japa', ...options }),
17+
createDriver: (options) => {
18+
const db = new Kysely<any>({
19+
dialect: new PostgresDialect({
20+
pool: new pg.Pool({ user: 'postgres', password: 'postgres' }),
21+
}),
22+
})
23+
24+
return createKyselyStore({ connection: db, prefix: 'japa', ...options })
25+
},
1826
})
1927
})

packages/bentocache/tests/drivers/kysely/sqlite.spec.ts

+9-7
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,19 @@ import { Kysely, SqliteDialect } from 'kysely'
55
import { createKyselyStore } from './helpers.js'
66
import { registerCacheDriverTestSuite } from '../../../src/test_suite.js'
77

8-
const db = new Kysely<any>({
9-
dialect: new SqliteDialect({
10-
database: new SQLite.default('./cache.sqlite3'),
11-
}),
12-
})
13-
148
test.group('Kysely | Postgres driver', (group) => {
159
registerCacheDriverTestSuite({
1610
test,
1711
group,
1812
supportsMilliseconds: false,
19-
createDriver: (options) => createKyselyStore({ connection: db, prefix: 'japa', ...options }),
13+
createDriver: (options) => {
14+
const db = new Kysely<any>({
15+
dialect: new SqliteDialect({
16+
database: new SQLite.default('./cache.sqlite3'),
17+
}),
18+
})
19+
20+
return createKyselyStore({ connection: db, prefix: 'japa', ...options })
21+
},
2022
})
2123
})

0 commit comments

Comments
 (0)