@web/test-runner-commands 0.6.2 → 0.6.5

package/browser/commands.mjs

@@ -69,6 +69,10 @@ export function sendKeys(options) {
   return executeServerCommand('send-keys', options);
 }
 
+export function selectOption(options) {
+  return executeServerCommand('select-option', options);
+}
+
 export function sendMouse(options) {
   return executeServerCommand('send-mouse', options);
 }
@@ -211,6 +215,8 @@ export async function compareSnapshot({ name, content }) {
             `New:\n${content}`,
         );
       }
+    } else if (currentSnapshot === content) {
+      return;
     }
   }
   await saveSnapshot({ name, content });

package/dist/selectOptionPlugin.d.ts

@@ -0,0 +1,17 @@
+import { TestRunnerPlugin } from '@web/test-runner-core';
+declare type SelectByValuePayload = {
+    selector: string;
+    value: string;
+};
+declare type SelectByLabelPayload = {
+    selector: string;
+    label: string;
+};
+declare type SelectMultipleValuesPayload = {
+    selector: string;
+    values: string[];
+};
+export declare type SelectOptionPayload = SelectByLabelPayload | SelectByValuePayload | SelectMultipleValuesPayload;
+export declare function selectOptionPlugin(): TestRunnerPlugin<SelectOptionPayload>;
+export {};
+//# sourceMappingURL=selectOptionPlugin.d.ts.map

package/dist/selectOptionPlugin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"selectOptionPlugin.d.ts","sourceRoot":"","sources":["../src/selectOptionPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAIzD,aAAK,oBAAoB,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAChE,aAAK,oBAAoB,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAChE,aAAK,2BAA2B,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAE1E,oBAAY,mBAAmB,GAC3B,oBAAoB,GACpB,oBAAoB,GACpB,2BAA2B,CAAC;AA8ChC,wBAAgB,kBAAkB,IAAI,gBAAgB,CAAC,mBAAmB,CAAC,CAgE1E"}

package/dist/selectOptionPlugin.js

@@ -0,0 +1,97 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.selectOptionPlugin = void 0;
+function isObject(payload) {
+    return payload != null && typeof payload === 'object';
+}
+function isSelectOptionPayload(payload) {
+    const validOptions = ['value', 'label', 'values'];
+    if (!isObject(payload))
+        throw new Error('You must provide a `SelectOptionPayload` object');
+    if (!payload.selector || typeof payload.selector !== 'string') {
+        throw new Error(`You must provide a selector representing the select you wish to locate`);
+    }
+    const numberOfValidOptions = Object.keys(payload).filter(key => validOptions.includes(key)).length;
+    const unknownOptions = Object.keys(payload).filter(key => ![...validOptions, 'selector'].includes(key));
+    if (numberOfValidOptions === 0)
+        throw new Error(`You must provide one of the following properties to pass to the browser runner: ${validOptions.join(', ')}.`);
+    if (unknownOptions.length > 0) {
+        throw new Error('Unknown options `' + unknownOptions.join(', ') + '` present.');
+    }
+    return true;
+}
+function isValuePayload(payload) {
+    return 'selector' in payload && 'value' in payload;
+}
+function isLabelPayload(payload) {
+    return 'selector' in payload && 'label' in payload;
+}
+function isMultiplePayload(payload) {
+    return 'selector' in payload && 'values' in payload;
+}
+function selectOptionPlugin() {
+    return {
+        name: 'select-option-command',
+        async executeCommand({ command, payload, session }) {
+            if (command === 'select-option') {
+                if (!isSelectOptionPayload(payload) || !payload) {
+                    throw new Error('You must provide a `SelectOptionPayload` object');
+                }
+                // handle specific behavior for playwright
+                if (session.browser.type === 'playwright') {
+                    const page = session.browser.getPage(session.id);
+                    if (isValuePayload(payload)) {
+                        const { selector, value } = payload;
+                        await page.locator(selector).selectOption(value);
+                        return true;
+                    }
+                    else if (isLabelPayload(payload)) {
+                        const { selector, label } = payload;
+                        await page.locator(selector).selectOption({ label });
+                        return true;
+                    }
+                    else if (isMultiplePayload(payload)) {
+                        const { selector, values } = payload;
+                        await page.locator(selector).selectOption([...values]);
+                        return true;
+                    }
+                }
+                // handle specific behavior for puppeteer
+                if (session.browser.type === 'puppeteer') {
+                    const page = session.browser.getPage(session.id);
+                    if (isValuePayload(payload)) {
+                        const { selector, value } = payload;
+                        await page.select(selector, value);
+                        return true;
+                    }
+                    else if (isMultiplePayload(payload)) {
+                        const { selector, values } = payload;
+                        await page.select(selector, ...values);
+                        return true;
+                    }
+                    else {
+                        throw new Error(`Puppeteer only supports selection of an option by its value(s):
+            https://pptr.dev/next/api/puppeteer.page.select#parameters
+            `);
+                    }
+                }
+                // handle specific behavior for webdriver
+                if (session.browser.type === 'webdriver') {
+                    throw new Error(`Selecting an option via a browser driver command is not currently implemented in WebDriver yet.
+            https://www.selenium.dev/documentation/webdriver/elements/select_lists/
+            
+            When using WebDriver, the current recommended (September 2022) approach is to:
+            - locate your select element (via querySelector or querySelectorAll)
+            - focus the element
+            - use sendKeys() to type the label of the option you wish to select
+            - use select.dispatchEvent(new Event('change')) to trigger a change event on the select.
+            `);
+                }
+                // you might not be able to support all browser launchers
+                throw new Error(`Selection of select element options is not supported for browser type ${session.browser.type}.`);
+            }
+        },
+    };
+}
+exports.selectOptionPlugin = selectOptionPlugin;
+//# sourceMappingURL=selectOptionPlugin.js.map

package/dist/selectOptionPlugin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"selectOptionPlugin.js","sourceRoot":"","sources":["../src/selectOptionPlugin.ts"],"names":[],"mappings":"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"}

package/dist/snapshotPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"snapshotPlugin.d.ts","sourceRoot":"","sources":["../src/snapshotPlugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAwBzD,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAiGD,MAAM,WAAW,oBAAoB;IACnC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,wBAAgB,cAAc,CAAC,MAAM,CAAC,EAAE,oBAAoB,GAAG,gBAAgB,CA2B9E"}
+{"version":3,"file":"snapshotPlugin.d.ts","sourceRoot":"","sources":["../src/snapshotPlugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAyBzD,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAuHD,MAAM,WAAW,oBAAoB;IACnC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,wBAAgB,cAAc,CAAC,MAAM,CAAC,EAAE,oBAAoB,GAAG,gBAAgB,CAoD9E"}

package/dist/snapshotPlugin.js

@@ -43,6 +43,7 @@ function getSnapshotPath(testFile) {
 class SnapshotStore {
     constructor() {
         this.snapshots = new Map();
+        this.sessionToSnapshotPath = new Map();
         this.readOperations = new Map();
     }
     async get(testFilePath) {
@@ -52,9 +53,10 @@ class SnapshotStore {
             // something else is already reading, wait for it
             await ((_a = this.readOperations.get(snapshotPath)) === null || _a === void 0 ? void 0 : _a.promise);
         }
-        if (this.snapshots.has(testFilePath)) {
+        const cachedContent = this.snapshots.get(snapshotPath);
+        if (cachedContent) {
             // return from cache
-            return this.snapshots.get(testFilePath);
+            return cachedContent;
         }
         const promiseObj = { resolve: () => { }, promise: Promise.resolve() };
         promiseObj.promise = new Promise(resolve => {
@@ -71,7 +73,7 @@ class SnapshotStore {
         this.readOperations.delete(snapshotPath);
         return content;
     }
-    async saveSnapshot(testFilePath, name, updatedSnapshot) {
+    async saveSnapshot(sessionId, testFilePath, name, updatedSnapshot) {
         const snapshotPath = getSnapshotPath(testFilePath);
         const nameStr = JSON.stringify(name);
         const startMarker = `snapshots[${nameStr}]`;
@@ -79,7 +81,7 @@ class SnapshotStore {
         const replacement = updatedSnapshot
             ? `${startMarker} = \n\`${updatedSnapshot}\`;\n${endMarker}`
             : '';
-        const content = await this.get(snapshotPath);
+        const content = await this.get(testFilePath);
         let updatedContent;
         const startIndex = content.indexOf(startMarker);
         if (startIndex !== -1) {
@@ -96,7 +98,21 @@ class SnapshotStore {
             // add new snapshot
             updatedContent = `${content}${replacement}`;
         }
+        if (updatedContent === content) {
+            // snapshot did not actually change, avoid marking snapshot as dirty
+            return;
+        }
+        this.sessionToSnapshotPath.set(sessionId, snapshotPath);
         this.snapshots.set(snapshotPath, updatedContent);
+    }
+    getSnapshotPathForSession(sessionId) {
+        return this.sessionToSnapshotPath.get(sessionId);
+    }
+    async writeSnapshot(snapshotPath) {
+        const updatedContent = this.snapshots.get(snapshotPath);
+        if (!updatedContent) {
+            throw new Error('Unexpected error while writing snapshots, could not find snapshot content.');
+        }
         if (updatedContent.includes('/* end snapshot')) {
             // update or create snapshot
             const fileDir = path_1.default.dirname(snapshotPath);
@@ -114,8 +130,31 @@ class SnapshotStore {
 function snapshotPlugin(config) {
     const updateSnapshots = config && config.updateSnapshots;
     const snapshots = new SnapshotStore();
+    const writePromises = new Set();
     return {
         name: 'file-commands',
+        serverStart({ webSockets }) {
+            webSockets.on('message', async ({ data }) => {
+                const { type, sessionId } = data;
+                if (type === 'wtr-session-finished') {
+                    if (typeof sessionId !== 'string') {
+                        throw new Error('Missing session id in wtr-session-finished event');
+                    }
+                    const snapshotPath = snapshots.getSnapshotPathForSession(sessionId);
+                    if (!snapshotPath) {
+                        return;
+                    }
+                    const writePromise = snapshots.writeSnapshot(snapshotPath);
+                    writePromises.add(writePromise);
+                    await writePromise;
+                    writePromises.delete(writePromise);
+                }
+            });
+        },
+        async serverStop() {
+            // ensure all write operations are finished
+            await Promise.all([...writePromises]);
+        },
         async executeCommand({ command, payload, session }) {
             if (command === 'get-snapshot-config') {
                 return { updateSnapshots };
@@ -128,7 +167,7 @@ function snapshotPlugin(config) {
                 if (!isSaveSnapshotPayload(payload)) {
                     throw new Error('Invalid save snapshot payload');
                 }
-                await snapshots.saveSnapshot(session.testFile, payload.name, payload.content);
+                await snapshots.saveSnapshot(session.id, session.testFile, payload.name, payload.content);
                 return true;
             }
         },

package/dist/snapshotPlugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"snapshotPlugin.js","sourceRoot":"","sources":["../src/snapshotPlugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"snapshotPlugin.js","sourceRoot":"","sources":["../src/snapshotPlugin.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web/test-runner-commands",
-  "version": "0.6.2",
+  "version": "0.6.5",
   "publishConfig": {
     "access": "public"
   },
@@ -48,13 +48,13 @@
     "commands"
   ],
   "dependencies": {
-    "@web/test-runner-core": "^0.10.20",
+    "@web/test-runner-core": "^0.10.27",
     "mkdirp": "^1.0.4"
   },
   "devDependencies": {
     "@web/test-runner-chrome": "^0.10.2",
     "@web/test-runner-playwright": "^0.8.9",
-    "@web/test-runner-webdriver": "^0.5.0",
+    "@web/test-runner-webdriver": "^0.5.1",
     "mocha": "^8.2.1"
   }
 }

package/src/selectOptionPlugin.ts

@@ -0,0 +1,122 @@
+import { TestRunnerPlugin } from '@web/test-runner-core';
+import type { ChromeLauncher } from '@web/test-runner-chrome';
+import type { PlaywrightLauncher } from '@web/test-runner-playwright';
+
+type SelectByValuePayload = { selector: string; value: string };
+type SelectByLabelPayload = { selector: string; label: string };
+type SelectMultipleValuesPayload = { selector: string; values: string[] };
+
+export type SelectOptionPayload =
+  | SelectByLabelPayload
+  | SelectByValuePayload
+  | SelectMultipleValuesPayload;
+
+function isObject(payload: unknown): payload is Record<string, unknown> {
+  return payload != null && typeof payload === 'object';
+}
+
+function isSelectOptionPayload(payload: unknown): boolean {
+  const validOptions = ['value', 'label', 'values'];
+
+  if (!isObject(payload)) throw new Error('You must provide a `SelectOptionPayload` object');
+
+  if (!payload.selector || typeof payload.selector !== 'string') {
+    throw new Error(`You must provide a selector representing the select you wish to locate`);
+  }
+
+  const numberOfValidOptions = Object.keys(payload).filter(key =>
+    validOptions.includes(key),
+  ).length;
+  const unknownOptions = Object.keys(payload).filter(
+    key => ![...validOptions, 'selector'].includes(key),
+  );
+
+  if (numberOfValidOptions === 0)
+    throw new Error(
+      `You must provide one of the following properties to pass to the browser runner: ${validOptions.join(
+        ', ',
+      )}.`,
+    );
+  if (unknownOptions.length > 0) {
+    throw new Error('Unknown options `' + unknownOptions.join(', ') + '` present.');
+  }
+  return true;
+}
+
+function isValuePayload(payload: SelectOptionPayload): payload is SelectByValuePayload {
+  return 'selector' in payload && 'value' in payload;
+}
+
+function isLabelPayload(payload: SelectOptionPayload): payload is SelectByLabelPayload {
+  return 'selector' in payload && 'label' in payload;
+}
+
+function isMultiplePayload(payload: SelectOptionPayload): payload is SelectMultipleValuesPayload {
+  return 'selector' in payload && 'values' in payload;
+}
+
+export function selectOptionPlugin(): TestRunnerPlugin<SelectOptionPayload> {
+  return {
+    name: 'select-option-command',
+    async executeCommand({ command, payload, session }): Promise<any> {
+      if (command === 'select-option') {
+        if (!isSelectOptionPayload(payload) || !payload) {
+          throw new Error('You must provide a `SelectOptionPayload` object');
+        }
+        // handle specific behavior for playwright
+        if (session.browser.type === 'playwright') {
+          const page = (session.browser as PlaywrightLauncher).getPage(session.id);
+          if (isValuePayload(payload)) {
+            const { selector, value } = payload;
+            await page.locator(selector).selectOption(value);
+            return true;
+          } else if (isLabelPayload(payload)) {
+            const { selector, label } = payload;
+            await page.locator(selector).selectOption({ label });
+            return true;
+          } else if (isMultiplePayload(payload)) {
+            const { selector, values } = payload;
+            await page.locator(selector).selectOption([...values]);
+            return true;
+          }
+        }
+
+        // handle specific behavior for puppeteer
+        if (session.browser.type === 'puppeteer') {
+          const page = (session.browser as ChromeLauncher).getPage(session.id);
+          if (isValuePayload(payload)) {
+            const { selector, value } = payload;
+            await page.select(selector, value);
+            return true;
+          } else if (isMultiplePayload(payload)) {
+            const { selector, values } = payload;
+            await page.select(selector, ...values);
+            return true;
+          } else {
+            throw new Error(`Puppeteer only supports selection of an option by its value(s):
+            https://pptr.dev/next/api/puppeteer.page.select#parameters
+            `);
+          }
+        }
+
+        // handle specific behavior for webdriver
+        if (session.browser.type === 'webdriver') {
+          throw new Error(`Selecting an option via a browser driver command is not currently implemented in WebDriver yet.
+            https://www.selenium.dev/documentation/webdriver/elements/select_lists/
+            
+            When using WebDriver, the current recommended (September 2022) approach is to:
+            - locate your select element (via querySelector or querySelectorAll)
+            - focus the element
+            - use sendKeys() to type the label of the option you wish to select
+            - use select.dispatchEvent(new Event('change')) to trigger a change event on the select.
+            `);
+        }
+
+        // you might not be able to support all browser launchers
+        throw new Error(
+          `Selection of select element options is not supported for browser type ${session.browser.type}.`,
+        );
+      }
+    },
+  };
+}

package/src/snapshotPlugin.ts

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
 import { TestRunnerPlugin } from '@web/test-runner-core';
+import { ServerStartParams } from '@web/dev-server-core';
 import path from 'path';
 import fs from 'fs';
 import { promisify } from 'util';
@@ -46,6 +47,7 @@ function getSnapshotPath(testFile: string) {
 
 class SnapshotStore {
   private snapshots = new Map<string, string>();
+  private sessionToSnapshotPath = new Map<string, string>();
   private readOperations = new Map<string, { promise: Promise<void>; resolve: () => void }>();
 
   async get(testFilePath: string): Promise<string> {
@@ -56,9 +58,10 @@ class SnapshotStore {
       await this.readOperations.get(snapshotPath)?.promise;
     }
 
-    if (this.snapshots.has(testFilePath)) {
+    const cachedContent = this.snapshots.get(snapshotPath);
+    if (cachedContent) {
       // return from cache
-      return this.snapshots.get(testFilePath)!;
+      return cachedContent;
     }
 
     const promiseObj = { resolve: () => {}, promise: Promise.resolve() };
@@ -66,7 +69,6 @@ class SnapshotStore {
       promiseObj.resolve = resolve;
     });
     this.readOperations.set(testFilePath, promiseObj);
-
     // store in cache
     const content = (await fileExists(snapshotPath))
       ? await readFile(snapshotPath, 'utf-8')
@@ -79,7 +81,12 @@ class SnapshotStore {
     return content;
   }
 
-  async saveSnapshot(testFilePath: string, name: string, updatedSnapshot: string) {
+  async saveSnapshot(
+    sessionId: string,
+    testFilePath: string,
+    name: string,
+    updatedSnapshot: string,
+  ) {
     const snapshotPath = getSnapshotPath(testFilePath);
     const nameStr = JSON.stringify(name);
     const startMarker = `snapshots[${nameStr}]`;
@@ -88,7 +95,7 @@ class SnapshotStore {
       ? `${startMarker} = \n\`${updatedSnapshot}\`;\n${endMarker}`
       : '';
 
-    const content = await this.get(snapshotPath);
+    const content = await this.get(testFilePath);
     let updatedContent: string;
 
     const startIndex = content.indexOf(startMarker);
@@ -107,8 +114,24 @@ class SnapshotStore {
       // add new snapshot
       updatedContent = `${content}${replacement}`;
     }
+    if (updatedContent === content) {
+      // snapshot did not actually change, avoid marking snapshot as dirty
+      return;
+    }
 
+    this.sessionToSnapshotPath.set(sessionId, snapshotPath);
     this.snapshots.set(snapshotPath, updatedContent);
+  }
+
+  getSnapshotPathForSession(sessionId: string) {
+    return this.sessionToSnapshotPath.get(sessionId);
+  }
+
+  async writeSnapshot(snapshotPath: string) {
+    const updatedContent = this.snapshots.get(snapshotPath);
+    if (!updatedContent) {
+      throw new Error('Unexpected error while writing snapshots, could not find snapshot content.');
+    }
     if (updatedContent.includes('/* end snapshot')) {
       // update or create snapshot
       const fileDir = path.dirname(snapshotPath);
@@ -130,10 +153,35 @@ export interface SnapshotPluginConfig {
 export function snapshotPlugin(config?: SnapshotPluginConfig): TestRunnerPlugin {
   const updateSnapshots = config && config.updateSnapshots;
   const snapshots = new SnapshotStore();
+  const writePromises = new Set<Promise<void>>();
 
   return {
     name: 'file-commands',
 
+    serverStart({ webSockets }: ServerStartParams) {
+      webSockets!.on('message', async ({ data }) => {
+        const { type, sessionId } = data;
+        if (type === 'wtr-session-finished') {
+          if (typeof sessionId !== 'string') {
+            throw new Error('Missing session id in wtr-session-finished event');
+          }
+          const snapshotPath = snapshots.getSnapshotPathForSession(sessionId);
+          if (!snapshotPath) {
+            return;
+          }
+          const writePromise = snapshots.writeSnapshot(snapshotPath);
+          writePromises.add(writePromise);
+          await writePromise;
+          writePromises.delete(writePromise);
+        }
+      });
+    },
+
+    async serverStop() {
+      // ensure all write operations are finished
+      await Promise.all([...writePromises]);
+    },
+
     async executeCommand({ command, payload, session }) {
       if (command === 'get-snapshot-config') {
         return { updateSnapshots };
@@ -149,7 +197,7 @@ export function snapshotPlugin(config?: SnapshotPluginConfig): TestRunnerPlugin
           throw new Error('Invalid save snapshot payload');
         }
 
-        await snapshots.saveSnapshot(session.testFile, payload.name, payload.content);
+        await snapshots.saveSnapshot(session.id, session.testFile, payload.name, payload.content);
         return true;
       }
     },