@fluidframework/azure-end-to-end-tests 2.101.0 → 2.102.0

package/src/test/ddsTests.spec.ts

@@ -19,7 +19,7 @@ import {
 } from "./AzureClientFactory.js";
 import { CounterTestDataObject, TestDataObject } from "./TestDataObject.js";
 import * as ephemeralSummaryTrees from "./ephemeralSummaryTrees.js";
-import { getTestMatrix, mapWait } from "./utils.js";
+import { getTestMatrix, mapWait, currentVersion } from "./utils.js";
 
 const testMatrix = getTestMatrix();
 for (const testOpts of testMatrix) {
@@ -54,9 +54,13 @@ for (const testOpts of testMatrix) {
 					"test-user-name-1",
 				);
 				containerId = getContainerIdFromPayloadResponse(containerResponse);
-				({ container: newContainer } = await client.getContainer(containerId, schema, "2"));
+				({ container: newContainer } = await client.getContainer(
+					containerId,
+					schema,
+					currentVersion,
+				));
 			} else {
-				({ container: newContainer } = await client.createContainer(schema, "2"));
+				({ container: newContainer } = await client.createContainer(schema, currentVersion));
 				containerId = await newContainer.attach();
 			}
 
@@ -67,7 +71,7 @@ for (const testOpts of testMatrix) {
 				});
 			}
 
-			const resources = client.getContainer(containerId, schema, "2");
+			const resources = client.getContainer(containerId, schema, currentVersion);
 			await assert.doesNotReject(
 				resources,
 				() => true,
@@ -97,9 +101,9 @@ for (const testOpts of testMatrix) {
 					"test-user-name-1",
 				);
 				containerId = getContainerIdFromPayloadResponse(containerResponse);
-				({ container } = await client.getContainer(containerId, schema, "2"));
+				({ container } = await client.getContainer(containerId, schema, currentVersion));
 			} else {
-				({ container } = await client.createContainer(schema, "2"));
+				({ container } = await client.createContainer(schema, currentVersion));
 				containerId = await container.attach();
 			}
 
@@ -115,7 +119,11 @@ for (const testOpts of testMatrix) {
 			map1Create.set("new-key", "new-value");
 			const valueCreate: string | undefined = map1Create.get("new-key");
 
-			const { container: containerGet } = await client.getContainer(containerId, schema, "2");
+			const { container: containerGet } = await client.getContainer(
+				containerId,
+				schema,
+				currentVersion,
+			);
 			const map1Get = containerGet.initialObjects.map1;
 			const valueGet: string | undefined = await mapWait(map1Get, "new-key");
 			assert.strictEqual(valueGet, valueCreate, "container can't change initial objects");
@@ -142,9 +150,9 @@ for (const testOpts of testMatrix) {
 					"test-user-name-1",
 				);
 				containerId = getContainerIdFromPayloadResponse(containerResponse);
-				({ container } = await client.getContainer(containerId, doSchema, "2"));
+				({ container } = await client.getContainer(containerId, doSchema, currentVersion));
 			} else {
-				({ container } = await client.createContainer(doSchema, "2"));
+				({ container } = await client.createContainer(doSchema, currentVersion));
 				containerId = await container.attach();
 			}
 
@@ -168,7 +176,7 @@ for (const testOpts of testMatrix) {
 			const { container: containerGet } = await client.getContainer(
 				containerId,
 				doSchema,
-				"2",
+				currentVersion,
 			);
 			const initialObjectsGet = containerGet.initialObjects;
 			assert(
@@ -205,9 +213,9 @@ for (const testOpts of testMatrix) {
 					"test-user-name-1",
 				);
 				containerId = getContainerIdFromPayloadResponse(containerResponse);
-				({ container } = await client.getContainer(containerId, doSchema, "2"));
+				({ container } = await client.getContainer(containerId, doSchema, currentVersion));
 			} else {
-				({ container } = await client.createContainer(doSchema, "2"));
+				({ container } = await client.createContainer(doSchema, currentVersion));
 				containerId = await container.attach();
 			}
 
@@ -235,7 +243,7 @@ for (const testOpts of testMatrix) {
 			const { container: containerGet } = await client.getContainer(
 				containerId,
 				doSchema,
-				"2",
+				currentVersion,
 			);
 			const initialObjectsGet = containerGet.initialObjects;
 			assert(
@@ -274,7 +282,7 @@ for (const testOpts of testMatrix) {
 				);
 				containerId = getContainerIdFromPayloadResponse(containerResponse);
 			} else {
-				({ container } = await client.createContainer(doSchema, "2"));
+				({ container } = await client.createContainer(doSchema, currentVersion));
 
 				const initialObjectsCreate = container.initialObjects;
 				const mdo2 = initialObjectsCreate.mdo2 as CounterTestDataObject;
@@ -297,7 +305,7 @@ for (const testOpts of testMatrix) {
 			const { container: containerGet } = await client.getContainer(
 				containerId,
 				doSchema,
-				"2",
+				currentVersion,
 			);
 			const initialObjectsGet = containerGet.initialObjects;
 			const mdo2get = initialObjectsGet.mdo2 as CounterTestDataObject;
@@ -333,9 +341,13 @@ for (const testOpts of testMatrix) {
 					"test-user-name-1",
 				);
 				containerId = getContainerIdFromPayloadResponse(containerResponse);
-				({ container } = await client.getContainer(containerId, dynamicSchema, "2"));
+				({ container } = await client.getContainer(
+					containerId,
+					dynamicSchema,
+					currentVersion,
+				));
 			} else {
-				({ container } = await client.createContainer(dynamicSchema, "2"));
+				({ container } = await client.createContainer(dynamicSchema, currentVersion));
 				containerId = await container.attach();
 			}
 

package/src/test/multiprocess/childClient.tool.ts

@@ -31,6 +31,7 @@ import { timeoutPromise } from "@fluidframework/test-utils/internal";
 
 import { createAzureTokenProvider } from "../AzureTokenFactory.js";
 import { TestDataObject } from "../TestDataObject.js";
+import { currentVersion } from "../utils.js";
 
 import type {
 	MessageFromChild as MessageToParent,
@@ -145,10 +146,14 @@ const getOrCreateContainer = async (params: {
 	});
 	let services: AzureContainerServices;
 	if (containerId === undefined) {
-		({ container, services } = await client.createContainer(containerSchema, "2"));
+		({ container, services } = await client.createContainer(containerSchema, currentVersion));
 		containerId = await container.attach();
 	} else {
-		({ container, services } = await client.getContainer(containerId, containerSchema, "2"));
+		({ container, services } = await client.getContainer(
+			containerId,
+			containerSchema,
+			currentVersion,
+		));
 	}
 	container.on("disconnected", onDisconnected);
 

package/src/test/signals.spec.ts

@@ -19,7 +19,7 @@ import {
 } from "./AzureClientFactory.js";
 import { SignalerTestDataObject } from "./TestDataObject.js";
 import * as ephemeralSummaryTrees from "./ephemeralSummaryTrees.js";
-import { configProvider, getTestMatrix } from "./utils.js";
+import { configProvider, getTestMatrix, currentVersion } from "./utils.js";
 
 interface UserIdAndName {
 	readonly id: string;
@@ -108,14 +108,22 @@ for (const testOpts of testMatrix) {
 						"test-user-name-1",
 					);
 					containerId = getContainerIdFromPayloadResponse(containerResponse);
-					({ container, services } = await client.getContainer(containerId, schema, "2"));
+					({ container, services } = await client.getContainer(
+						containerId,
+						schema,
+						currentVersion,
+					));
 				} else {
-					({ container, services } = await client.createContainer(schema, "2"));
+					({ container, services } = await client.createContainer(schema, currentVersion));
 					containerId = await container.attach();
 				}
 			} else {
 				containerId = id;
-				({ container, services } = await client.getContainer(containerId, schema, "2"));
+				({ container, services } = await client.getContainer(
+					containerId,
+					schema,
+					currentVersion,
+				));
 			}
 
 			if (container.connectionState !== ConnectionState.Connected) {

package/src/test/tree.spec.ts

@@ -20,7 +20,7 @@ import {
 	getContainerIdFromPayloadResponse,
 } from "./AzureClientFactory.js";
 import * as ephemeralSummaryTrees from "./ephemeralSummaryTrees.js";
-import { getTestMatrix } from "./utils.js";
+import { getTestMatrix, currentVersion } from "./utils.js";
 
 const sf = new SchemaFactory("d302b84c-75f6-4ecd-9663-524f467013e3");
 
@@ -87,7 +87,7 @@ for (const testOpts of testMatrix) {
 			let treeData: TreeView<typeof StringArray>;
 
 			if (summaryTree === undefined) {
-				const { container } = await client.createContainer(schema, "2");
+				const { container } = await client.createContainer(schema, currentVersion);
 				treeData = container.initialObjects.tree1.viewWith(treeConfiguration);
 				treeData.initialize(new StringArray([]));
 				containerId = await container.attach();
@@ -100,7 +100,7 @@ for (const testOpts of testMatrix) {
 				);
 
 				containerId = getContainerIdFromPayloadResponse(containerResponse);
-				const { container } = await client.getContainer(containerId, schema, "2");
+				const { container } = await client.getContainer(containerId, schema, currentVersion);
 				treeData = container.initialObjects.tree1.viewWith(treeConfiguration);
 				await waitForConnection(container);
 			}
@@ -137,7 +137,7 @@ for (const testOpts of testMatrix) {
 
 			treeData.root.insertNew("test string 1");
 
-			const resources = client.getContainer(containerId, schema, "2");
+			const resources = client.getContainer(containerId, schema, currentVersion);
 			await assert.doesNotReject(
 				resources,
 				() => true,
@@ -172,7 +172,7 @@ for (const testOpts of testMatrix) {
 				}) {}
 
 				it("can read and edit data", async () => {
-					const { container } = await client.createContainer(schema, "2");
+					const { container } = await client.createContainer(schema, currentVersion);
 					await container.attach();
 					const view = container.initialObjects.tree1.viewWith(
 						new TreeViewConfiguration({ schema: User, enableSchemaValidation: true }),
@@ -213,7 +213,7 @@ for (const testOpts of testMatrix) {
 				});
 
 				it("can handle undo/redo and transactions", async () => {
-					const { container } = await client.createContainer(schema, "2");
+					const { container } = await client.createContainer(schema, currentVersion);
 					await container.attach();
 					const view = asAlpha(
 						container.initialObjects.tree1.viewWith(
@@ -262,7 +262,7 @@ for (const testOpts of testMatrix) {
 			it("can use identifiers and the static Tree APIs", async () => {
 				class Widget extends sf.object("Widget", { id: sf.identifier }) {}
 
-				const { container } = await client.createContainer(schema, "2");
+				const { container } = await client.createContainer(schema, currentVersion);
 				await container.attach();
 				const view = container.initialObjects.tree1.viewWith(
 					new TreeViewConfiguration({
@@ -297,7 +297,7 @@ for (const testOpts of testMatrix) {
 				}) {}
 				allowUnused<ValidateRecursiveSchema<typeof Doll>>();
 
-				const { container } = await client.createContainer(schema, "2");
+				const { container } = await client.createContainer(schema, currentVersion);
 				await container.attach();
 				const view = container.initialObjects.tree1.viewWith(
 					new TreeViewConfiguration({ schema: Doll, enableSchemaValidation: true }),

package/src/test/tsconfig.json

@@ -1,11 +1,14 @@
 {
 	"extends": "../../../../../../common/build/build-common/tsconfig.test.node16.json",
+	// This deviates from the standard test tsconfig pattern to accommodate `gen-version`, which emits
+	// `src/packageVersion.ts` one directory above the test sources. We widen `rootDir` (and adjust
+	// `outDir` to match) and explicitly include the generated file so it compiles alongside the tests.
 	"compilerOptions": {
-		"rootDir": "./",
-		"outDir": "../../lib/test",
+		"rootDir": "../",
+		"outDir": "../../lib",
 		"types": ["mocha", "node"],
 		"noUncheckedIndexedAccess": false,
 		"exactOptionalPropertyTypes": false,
 	},
-	"include": ["./**/*"],
+	"include": ["./**/*", "../packageVersion.ts"],
 }

package/src/test/utils.ts

@@ -8,6 +8,10 @@ import type { ConfigTypes, IConfigProviderBase } from "@fluidframework/core-inte
 import type { IMember } from "@fluidframework/fluid-static";
 import type { ISharedMap, IValueChanged } from "@fluidframework/map/legacy";
 
+// `pkgVersion` is this package's own version, which tracks the Fluid Framework release group; we use it as
+// `minVersionForCollab` in tests so they exercise the latest defaults rather than a hardcoded version.
+export { pkgVersion as currentVersion } from "../packageVersion.js";
+
 export const waitForMember = async (
 	audience: IAzureAudience,
 	id: string,

package/src/test/viewContainerVersion.spec.ts

@@ -17,7 +17,7 @@ import {
 	getContainerIdFromPayloadResponse,
 } from "./AzureClientFactory.js";
 import * as ephemeralSummaryTrees from "./ephemeralSummaryTrees.js";
-import { getTestMatrix } from "./utils.js";
+import { getTestMatrix, currentVersion } from "./utils.js";
 
 const testMatrix = getTestMatrix();
 for (const testOpts of testMatrix) {
@@ -63,9 +63,9 @@ for (const testOpts of testMatrix) {
 					"test-user-name-1",
 				);
 				containerId = getContainerIdFromPayloadResponse(containerResponse);
-				({ container } = await client.getContainer(containerId, schema, "2"));
+				({ container } = await client.getContainer(containerId, schema, currentVersion));
 			} else {
-				({ container } = await client.createContainer(schema, "2"));
+				({ container } = await client.createContainer(schema, currentVersion));
 				containerId = await container.attach();
 			}
 
@@ -126,7 +126,7 @@ for (const testOpts of testMatrix) {
 				);
 				containerId = getContainerIdFromPayloadResponse(containerResponse);
 			} else {
-				({ container } = await client.createContainer(schema, "2"));
+				({ container } = await client.createContainer(schema, currentVersion));
 				containerId = await container.attach();
 
 				if (container.connectionState !== ConnectionState.Connected) {
@@ -143,7 +143,7 @@ for (const testOpts of testMatrix) {
 				containerId,
 				schema,
 				versions[0],
-				"2",
+				currentVersion,
 			);
 			await assert.doesNotReject(viewContainerVersionAttempt);
 			const { container: containerView } = await viewContainerVersionAttempt;
@@ -169,10 +169,10 @@ for (const testOpts of testMatrix) {
 					"test-user-name-1",
 				);
 				containerId = getContainerIdFromPayloadResponse(containerResponse);
-				({ container } = await client.getContainer(containerId, schema, "2"));
+				({ container } = await client.getContainer(containerId, schema, currentVersion));
 				map1 = container.initialObjects.map1 as SharedMap;
 			} else {
-				({ container } = await client.createContainer(schema, "2"));
+				({ container } = await client.createContainer(schema, currentVersion));
 
 				map1 = container.initialObjects.map1 as SharedMap;
 				map1.set(testKey, expectedValue);
@@ -197,7 +197,7 @@ for (const testOpts of testMatrix) {
 				containerId,
 				schema,
 				versions[versions.length - 1],
-				"2",
+				currentVersion,
 			);
 			await assert.doesNotReject(viewContainerVersionAttempt);
 			const { container: containerView } = await viewContainerVersionAttempt;
@@ -216,7 +216,7 @@ for (const testOpts of testMatrix) {
 				{
 					id: "whatever",
 				},
-				"2",
+				currentVersion,
 			);
 			const errorFn = (error: Error): boolean => {
 				assert.notStrictEqual(error.message, undefined, "Azure Client error is undefined");

package/src/test/.mocharc.cjs

@@ -1,11 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-
-"use strict";
-
-const packageDir = `${__dirname}/../..`;
-const getFluidTestMochaConfig = require("@fluid-private/test-version-utils/mocharc-common");
-const config = getFluidTestMochaConfig(packageDir);
-module.exports = config;