Change to return object of descr/it instead of fn

Author: tsmith023

src/collections/config/integration.test.ts

@@ -239,7 +239,7 @@ describe('Testing of the collection.config namespace', () => {
     expect(config.vectorizers.default.vectorizer.name).toEqual('none');
   });
 
-  requireAtLeast(1, 26, 0)(it)('should be able to get the config of a collection with hnsw-sq', async () => {
+  requireAtLeast(1, 26, 0).it('should be able to get the config of a collection with hnsw-sq', async () => {
     const collectionName = 'TestCollectionConfigGetHNSWPlusSQ';
     const collection = await client.collections.create({
       name: collectionName,
@@ -418,7 +418,7 @@ describe('Testing of the collection.config namespace', () => {
     ]);
   });
 
-  requireAtLeast(1, 31, 0)(describe)('Mutable named vectors', () => {
+  requireAtLeast(1, 31, 0).describe('Mutable named vectors', () => {
     it('should be able to add named vectors to a collection', async () => {
       const collectionName = 'TestCollectionConfigAddVector' as const;
       const collection = await client.collections.create({

src/collections/query/integration.test.ts

@@ -134,7 +134,7 @@ describe('Testing of the collection.query methods with a simple collection', ()
     expect(ret.objects[0].uuid).toEqual(id);
   });
 
-  requireAtLeast(1, 31, 0)(describe)('bm25 search operator (minimum_should_match)', () => {
+  requireAtLeast(1, 31, 0).describe('bm25 search operator (minimum_should_match)', () => {
     it('should query with bm25 + operator', async () => {
       const ret = await collection.query.bm25('carrot', {
         limit: 1,

src/roles/integration.test.ts

@@ -279,7 +279,7 @@ const testCases: TestCase[] = [
   },
 ];
 
-requireAtLeast(1, 29, 0)(describe)('Integration testing of the roles namespace', () => {
+requireAtLeast(1, 29, 0).describe('Integration testing of the roles namespace', () => {
   let client: WeaviateClient;
 
   beforeAll(async () => {
@@ -313,7 +313,7 @@ requireAtLeast(1, 29, 0)(describe)('Integration testing of the roles namespace',
     expect(exists).toBeFalsy();
   });
 
-  requireAtLeast(1, 30, 0)(describe)('namespaced users', () => {
+  requireAtLeast(1, 30, 0).describe('namespaced users', () => {
     it('retrieves assigned users with/without namespace', async () => {
       await client.roles.create('landlord', {
         collection: 'Buildings',

src/users/integration.test.ts

@@ -3,7 +3,7 @@ import { requireAtLeast } from '../../test/version.js';
 import { WeaviateUserTypeDB } from '../openapi/types.js';
 import { GetUserOptions, UserDB } from './types.js';
 
-requireAtLeast(1, 29, 0)(describe)('Integration testing of the users namespace', () => {
+requireAtLeast(1, 29, 0).describe('Integration testing of the users namespace', () => {
   const makeClient = (key: string) =>
     weaviate.connectToLocal({
       port: 8091,
@@ -58,7 +58,7 @@ requireAtLeast(1, 29, 0)(describe)('Integration testing of the users namespace',
     expect(roles.test).toBeUndefined();
   });
 
-  requireAtLeast(1, 30, 0)(describe)('dynamic user management', () => {
+  requireAtLeast(1, 30, 0).describe('dynamic user management', () => {
     /** List dynamic DB users. */
     const listDBUsers = (c: WeaviateClient, opts?: GetUserOptions) =>
       c.users.db.listAll(opts).then((all) => all.filter((u) => u.userType == 'db_user'));
@@ -164,7 +164,7 @@ requireAtLeast(1, 29, 0)(describe)('Integration testing of the users namespace',
       expect(roles.Permissioner.nodesPermissions).toHaveLength(1);
     });
 
-    requireAtLeast(1, 30, 1)(describe)('additional DUM features', () => {
+    requireAtLeast(1, 30, 1).describe('additional DUM features', () => {
       it('should be able to fetch additional user info', async () => {
         const admin = await makeClient('admin-key');
         const timKey = await admin.users.db.create('timely-tim');

test/version.ts

@@ -3,7 +3,13 @@ import { DbVersion } from '../src/utils/dbVersion';
 const version = DbVersion.fromString(`v${process.env.WEAVIATE_VERSION!}`);
 
 /** Run the suite / test only for Weaviate version above this. */
-export const requireAtLeast =
-  (...semver: [...Parameters<DbVersion['isAtLeast']>]) =>
-  (func: jest.Describe | jest.It) =>
-    version.isAtLeast(...semver) ? func : func.skip;
+export const requireAtLeast = (...semver: [...Parameters<DbVersion['isAtLeast']>]) =>
+  version.isAtLeast(...semver)
+    ? {
+        describe,
+        it,
+      }
+    : {
+        describe: describe.skip,
+        it: it.skip,
+      };