Merge branch 'main' into fix/mcp-debug-log-cwd-pollution

Author: VishnuVardhanBR

firebase-vscode/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## NEXT
 
+## 2.2.0
+
+- Update internal `firebase-tools` dependency to 15.9.0
+
 ## 2.1.2
 
 - Update internal `firebase-tools` dependency to 15.7.0

firebase-vscode/package-lock.json

@@ -4,7 +4,7 @@
   "publisher": "GoogleCloudTools",
   "icon": "./resources/firebase_dataconnect_logo.png",
   "description": "Firebase Data Connect for VSCode",
-  "version": "2.1.2",
+  "version": "2.2.0",
   "engines": {
     "vscode": "^1.69.0"
   },

firebase-vscode/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "15.8.0",
+  "version": "15.9.0",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "mcpName": "io.github.firebase/firebase-mcp",

npm-shrinkwrap.json

@@ -9,7 +9,7 @@ import { appDistributionOrigin } from "../api";
 
 import {
   AabInfo,
-  AIInstruction,
+  AiInstructions,
   BatchRemoveTestersResponse,
   BatchUpdateTestCasesRequest,
   BatchUpdateTestCasesResponse,
@@ -276,7 +276,7 @@ export class AppDistributionClient {
   async createReleaseTest(
     releaseName: string,
     devices: TestDevice[],
-    aiInstruction?: AIInstruction,
+    aiInstructions?: AiInstructions,
     loginCredential?: LoginCredential,
     testCaseName?: string,
     displayName?: string,
@@ -289,7 +289,7 @@ export class AppDistributionClient {
           deviceExecutions: devices.map((device) => ({ device })),
           loginCredential,
           testCase: testCaseName,
-          aiInstructions: aiInstruction,
+          aiInstructions: aiInstructions,
           displayName: displayName,
         },
       });

package.json

@@ -116,20 +116,10 @@ export interface ReleaseTest {
   deviceExecutions: DeviceExecution[];
   loginCredential?: LoginCredential;
   testCase?: string;
-  aiInstructions?: AIInstruction;
+  aiInstructions?: AiInstructions;
   displayName?: string;
 }
 
-export interface AIInstruction {
-  steps: AIStep[];
-}
-
-export interface AIStep {
-  goal: string;
-  hint?: string;
-  successCriteria?: string;
-}
-
 export interface AiStep {
   goal: string;
   hint?: string;

src/appdistribution/client.ts

@@ -16,7 +16,7 @@ const TEST_CASES: TestCase[] = [
         {
           goal: "test-goal",
           hint: "test-hint",
-          successCriteria: "test-success-criteria",
+          successCriteria: "test-final-screen-assertion",
         },
       ],
     },
@@ -28,38 +28,41 @@ const TEST_CASES: TestCase[] = [
   },
 ];
 
-const YAML_STRING = `- displayName: test-display-name
-  id: test-case-id
-  prerequisiteTestCaseId: prerequisite-test-case-id
-  steps:
-    - goal: test-goal
-      hint: test-hint
-      successCriteria: test-success-criteria
-- displayName: minimal-case
-  id: minimal-id
-  steps:
-    - goal: win
+const YAML_STRING = `tests:
+  - displayName: test-display-name
+    id: test-case-id
+    prerequisiteTestCaseId: prerequisite-test-case-id
+    steps:
+      - goal: test-goal
+        hint: test-hint
+        finalScreenAssertion: test-final-screen-assertion
+  - displayName: minimal-case
+    id: minimal-id
+    steps:
+      - goal: win
 `;
 
-const YAML_DATA = [
-  {
-    displayName: "test-display-name",
-    id: "test-case-id",
-    prerequisiteTestCaseId: "prerequisite-test-case-id",
-    steps: [
-      {
-        goal: "test-goal",
-        hint: "test-hint",
-        successCriteria: "test-success-criteria",
-      },
-    ],
-  },
-  {
-    displayName: "minimal-case",
-    id: "minimal-id",
-    steps: [{ goal: "win" }],
-  },
-];
+const YAML_DATA = {
+  tests: [
+    {
+      displayName: "test-display-name",
+      id: "test-case-id",
+      prerequisiteTestCaseId: "prerequisite-test-case-id",
+      steps: [
+        {
+          goal: "test-goal",
+          hint: "test-hint",
+          finalScreenAssertion: "test-final-screen-assertion",
+        },
+      ],
+    },
+    {
+      displayName: "minimal-case",
+      id: "minimal-id",
+      steps: [{ goal: "win" }],
+    },
+  ],
+};
 
 describe("YamlHelper", () => {
   it("converts TestCase[] to YAML string", () => {
@@ -76,9 +79,10 @@ describe("YamlHelper", () => {
   it("converts YAML without ID", () => {
     const testCases = fromYaml(
       APP_NAME,
-      `- displayName: minimal-case
-  steps:
-    - goal: win
+      `tests:
+  - displayName: minimal-case
+    steps:
+      - goal: win
 `,
     );
     expect(testCases).to.eql([
@@ -93,29 +97,35 @@ describe("YamlHelper", () => {
     expect(() =>
       fromYaml(
         APP_NAME,
-        `- steps:
-  - goal: test-goal
-    hint: test-hint
-    successCriteria: test-success-criteria
+        `tests:
+  - steps:
+      - goal: test-goal
+        hint: test-hint
+        finalScreenAssertion: test-final-screen-assertion
 `,
       ),
     ).to.throw(/"displayName" is required/);
   });
 
   it("throws error if steps is missing", () => {
-    expect(() => fromYaml(APP_NAME, `- displayName: test-display-name`)).to.throw(
-      /"steps" is required/,
-    );
+    expect(() =>
+      fromYaml(
+        APP_NAME,
+        `tests:
+  - displayName: test-display-name`,
+      ),
+    ).to.throw(/"steps" is required/);
   });
 
   it("throws error if goal is missing", () => {
     expect(() =>
       fromYaml(
         APP_NAME,
-        `- displayName: test-display-name
-  steps:
-    - hint: test-hint
-      successCriteria: test-success-criteria
+        `tests:
+  - displayName: test-display-name
+    steps:
+      - hint: test-hint
+        finalScreenAssertion: test-final-screen-assertion
 `,
       ),
     ).to.throw(/"goal" is required/);
@@ -125,10 +135,11 @@ describe("YamlHelper", () => {
     expect(() =>
       fromYaml(
         APP_NAME,
-        `- displayName: test-display-name
-  extraTestCaseProperty: property
-  steps:
-    - goal: test-goal
+        `tests:
+  - displayName: test-display-name
+    extraTestCaseProperty: property
+    steps:
+      - goal: test-goal
 `,
       ),
     ).to.throw(/unexpected property "extraTestCaseProperty"/);
@@ -138,10 +149,11 @@ describe("YamlHelper", () => {
     expect(() =>
       fromYaml(
         APP_NAME,
-        `- displayName: test-display-name
-  steps:
-    - goal: test-goal
-      extraStepProperty: property
+        `tests:
+  - displayName: test-display-name
+    steps:
+      - goal: test-goal
+        extraStepProperty: property
 `,
       ),
     ).to.throw(/unexpected property "extraStepProperty"/);
@@ -151,13 +163,22 @@ describe("YamlHelper", () => {
     expect(() =>
       fromYaml(
         APP_NAME,
-        `-
-this is not valid YAML`,
+        `tests:
+  -
+  invalid key: value`,
       ),
-    ).to.throw(/at line 2/);
+    ).to.throw(/at line 3/);
+  });
+
+  it("throws error if YAML doesn't contain a top-level tests field", () => {
+    expect(() => fromYaml(APP_NAME, "not a list")).to.throw(
+      /YAML file must contain a top-level 'tests' field with a list of test cases/,
+    );
   });
 
-  it("throws error if YAML doesn't contain a top-level array", () => {
-    expect(() => fromYaml(APP_NAME, "not a list")).to.throw(/must contain a list of test cases/);
+  it("throws error if top-level 'tests' field is not an array", () => {
+    expect(() => fromYaml(APP_NAME, `tests: "not an array"`)).to.throw(
+      /The 'tests' field in the YAML file must contain a list of test cases/,
+    );
   });
 });