Merge with main

Author: flevi29

tests/documents.test.ts

@@ -680,17 +680,13 @@ describe("Documents tests", () => {
       test(`${permission} key: test updateDocumentsByFunction`, async () => {
         const client = await getClient(permission);
         const index = client.index<(typeof dataset)[number]>(indexPk.uid);
-        const adminKey = await getKey("Admin");
 
         await index.updateFilterableAttributes(["id"]).waitTask();
 
-        await fetch(`${HOST}/experimental-features`, {
-          body: JSON.stringify({ editDocumentsByFunction: true }),
-          headers: {
-            Authorization: `Bearer ${adminKey}`,
-            "Content-Type": "application/json",
-          },
-          method: "PATCH",
+        await (
+          await getClient("Master")
+        ).updateExperimentalFeatures({
+          editDocumentsByFunction: true,
         });
 
         await index.addDocuments(dataset).waitTask();
@@ -761,15 +757,11 @@ describe("Documents tests", () => {
 
       test(`${permission} key: Try updateDocumentsByFunction and be denied`, async () => {
         const client = await getClient(permission);
-        const adminKey = await getKey("Admin");
 
-        await fetch(`${HOST}/experimental-features`, {
-          body: JSON.stringify({ editDocumentsByFunction: true }),
-          headers: {
-            Authorization: `Bearer ${adminKey}`,
-            "Content-Type": "application/json",
-          },
-          method: "PATCH",
+        await (
+          await getClient("Master")
+        ).updateExperimentalFeatures({
+          editDocumentsByFunction: true,
         });
 
         await expect(
@@ -848,15 +840,11 @@ describe("Documents tests", () => {
 
       test(`${permission} key: Try updateDocumentsByFunction and be denied`, async () => {
         const client = await getClient(permission);
-        const adminKey = await getKey("Admin");
 
-        await fetch(`${HOST}/experimental-features`, {
-          body: JSON.stringify({ editDocumentsByFunction: true }),
-          headers: {
-            Authorization: `Bearer ${adminKey}`,
-            "Content-Type": "application/json",
-          },
-          method: "PATCH",
+        await (
+          await getClient("Master")
+        ).updateExperimentalFeatures({
+          editDocumentsByFunction: true,
         });
 
         await expect(
@@ -962,15 +950,11 @@ describe("Documents tests", () => {
       const route = `indexes/${indexPk.uid}/documents/edit`;
       const client = new MeiliSearch({ host });
       const strippedHost = trailing ? host.slice(0, -1) : host;
-      const adminKey = await getKey("Admin");
-
-      await fetch(`${HOST}/experimental-features`, {
-        body: JSON.stringify({ editDocumentsByFunction: true }),
-        headers: {
-          Authorization: `Bearer ${adminKey}`,
-          "Content-Type": "application/json",
-        },
-        method: "PATCH",
+
+      await (
+        await getClient("Master")
+      ).updateExperimentalFeatures({
+        editDocumentsByFunction: true,
       });
 
       await expect(

tests/embedders.test.ts

@@ -6,8 +6,7 @@ import {
   BAD_HOST,
   MeiliSearch,
   getClient,
-  getKey,
-  HOST,
+  masterClient,
 } from "./utils/meilisearch-test-utils.js";
 
 const index = {
@@ -206,16 +205,9 @@ describe.each([{ permission: "Master" }, { permission: "Admin" }])(
     });
 
     test(`${permission} key: Update embedders with composite embedder`, async () => {
-      const adminKey = await getKey("Admin");
-
       // first enable the network endpoint.
-      await fetch(`${HOST}/experimental-features`, {
-        body: JSON.stringify({ compositeEmbedders: true }),
-        headers: {
-          Authorization: `Bearer ${adminKey}`,
-          "Content-Type": "application/json",
-        },
-        method: "PATCH",
+      await masterClient.updateExperimentalFeatures({
+        compositeEmbedders: true,
       });
 
       const client = await getClient(permission);

tests/experimental-features.test.ts

@@ -0,0 +1,35 @@
+import { afterAll, test } from "vitest";
+import { assert, getClient } from "./utils/meilisearch-test-utils.js";
+import type { RuntimeTogglableFeatures } from "../src/index.js";
+
+const ms = await getClient("Master");
+
+afterAll(async () => {
+  await ms.updateExperimentalFeatures({
+    metrics: false,
+    logsRoute: false,
+    editDocumentsByFunction: false,
+    containsFilter: false,
+    network: false,
+    getTaskDocumentsRoute: false,
+    compositeEmbedders: false,
+  } satisfies { [TKey in keyof RuntimeTogglableFeatures]-?: false });
+});
+
+test(`${ms.updateExperimentalFeatures.name} and ${ms.getExperimentalFeatures.name} methods`, async () => {
+  const features: { [TKey in keyof RuntimeTogglableFeatures]-?: true } = {
+    metrics: true,
+    logsRoute: true,
+    editDocumentsByFunction: true,
+    containsFilter: true,
+    network: true,
+    getTaskDocumentsRoute: true,
+    compositeEmbedders: true,
+  };
+
+  const updateFeatures = await ms.updateExperimentalFeatures(features);
+  assert.deepEqual(updateFeatures, features);
+
+  const getFeatures = await ms.getExperimentalFeatures();
+  assert.deepEqual(getFeatures, features);
+});