Skip to content

Commit 2fafb0b

Browse files
committed
Use @testcontainers/weaviate, fix TODO comments
1 parent 9e7a77f commit 2fafb0b

File tree

4 files changed

+22
-12
lines changed

4 files changed

+22
-12
lines changed

package-lock.json

Lines changed: 14 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
"@curveball/core": "0.20.0",
6767
"@curveball/kernel": "0.20.1",
6868
"@rollup/plugin-babel": "^5.3.1",
69+
"@testcontainers/weaviate": "^10.14.0",
6970
"@types/express": "^4.17.21",
7071
"@types/isomorphic-fetch": "^0.0.36",
7172
"@types/jest": "^29.4.0",
@@ -89,7 +90,6 @@
8990
"prettier": "^2.8.4",
9091
"prettier-plugin-organize-imports": "^3.2.4",
9192
"protobufjs": "^7.2.6",
92-
"testcontainers": "^10.13.2",
9393
"ts-jest": "^29.0.5",
9494
"ts-node": "^10.9.2",
9595
"ts-proto": "^1.163.0",

src/connection/integration.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
import { GenericContainer, StartedTestContainer } from 'testcontainers';
1+
import { StartedWeaviateContainer, WeaviateContainer } from '@testcontainers/weaviate';
22
import weaviate from '..';
33
import { WeaviateStartUpError } from '../errors';
44
import { Meta } from '../openapi/types';
55
import { DbVersion } from '../utils/dbVersion';
66

77
describe('Integration testing of the ConnectionGRPC class', () => {
8-
let container: StartedTestContainer;
8+
let container: StartedWeaviateContainer;
99

1010
const getVersion = () =>
1111
fetch(`http://${container.getHost()}:${container.getMappedPort(8080)}/v1/meta`)
1212
.then((res) => res.json() as Promise<Meta>)
1313
.then((meta) => DbVersion.fromString(meta.version!));
1414

1515
beforeAll(async () => {
16-
container = await new GenericContainer(`semitechnologies/weaviate:${process.env.WEAVIATE_VERSION}`)
16+
container = await new WeaviateContainer(`semitechnologies/weaviate:${process.env.WEAVIATE_VERSION}`)
1717
.withExposedPorts(8080, 50051)
1818
.withEnvironment({
1919
GRPC_MAX_MESSAGE_SIZE: '1',
@@ -32,13 +32,13 @@ describe('Integration testing of the ConnectionGRPC class', () => {
3232
port: container.getMappedPort(8080),
3333
grpcPort: container.getMappedPort(50051),
3434
});
35-
expect(dbVersion.isLowerThan(1, 27, 0)).toBe(true); // TODO: change to 1.27.1 when it lands
35+
expect(dbVersion.isLowerThan(1, 27, 1)).toBe(true);
3636
} catch (err) {
3737
expect(err).toBeInstanceOf(WeaviateStartUpError);
3838
expect((err as WeaviateStartUpError).message).toContain(
3939
'RESOURCE_EXHAUSTED: Attempted to send message with a size larger than 1'
4040
);
41-
expect(dbVersion.isAtLeast(1, 27, 0)).toBe(true); // TODO: change to 1.27.1 when it lands
41+
expect(dbVersion.isAtLeast(1, 27, 1)).toBe(true);
4242
}
4343
});
4444
});

src/utils/dbVersion.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ export class DbVersionSupport {
135135
supports:
136136
(version.isAtLeast(1, 24, 0) && version.isLowerThan(1, 24, 26)) ||
137137
(version.isAtLeast(1, 25, 0) && version.isLowerThan(1, 25, 22)) ||
138-
(version.isAtLeast(1, 26, 0) && version.isLowerThan(1, 26, 8)),
139-
// || (version.isAtLeast(1, 27, 0) && version.isLowerThan(1, 27, 1)), // TODO: comment back in when 1.27.1 lands
138+
(version.isAtLeast(1, 26, 0) && version.isLowerThan(1, 26, 8)) ||
139+
(version.isAtLeast(1, 27, 0) && version.isLowerThan(1, 27, 1)),
140140
message: this.errorMessage(
141141
'Named vectors insert fix',
142142
version.show(),

0 commit comments

Comments
 (0)