chore: upgrade to webdriverio 8.28.8 COMPASS-7597 (#5421)

* webdriverio 8.28.8

Author: lerouxb

package-lock.json

@@ -40,10 +40,10 @@ export async function addCollection(
   const createModalElement = await browser.$(Selectors.CreateCollectionModal);
   await createModalElement.waitForDisplayed();
 
-  const collectionInput = await browser.$(
-    Selectors.CreateDatabaseCollectionName
+  await browser.setValueVisible(
+    Selectors.CreateDatabaseCollectionName,
+    collectionName
   );
-  await collectionInput.setValue(collectionName);
 
   if (collectionOptions) {
     await browser.clickVisible(
@@ -54,11 +54,10 @@ export async function addCollection(
   if (collectionOptions && collectionOptions.capped) {
     await browser.clickVisible(Selectors.CreateCollectionCappedCheckboxLabel);
 
-    const sizeElement = await browser.$(
-      Selectors.CreateCollectionCappedSizeInput
+    await browser.setValueVisible(
+      Selectors.CreateCollectionCappedSizeInput,
+      collectionOptions.capped.size.toString()
     );
-    await sizeElement.waitForDisplayed();
-    await sizeElement.setValue(collectionOptions.capped.size.toString());
   }
 
   if (collectionOptions && collectionOptions.customCollation) {
@@ -101,18 +100,16 @@ export async function addCollection(
       Selectors.CreateCollectionTimeseriesCheckboxLabel
     );
 
-    const timeField = await browser.$(
-      Selectors.CreateCollectionTimeseriesTimeField
+    await browser.setValueVisible(
+      Selectors.CreateCollectionTimeseriesTimeField,
+      collectionOptions.timeseries.timeField
     );
-    await timeField.waitForDisplayed();
-    await timeField.setValue(collectionOptions.timeseries.timeField);
 
     if (collectionOptions.timeseries.metaField) {
-      const metaField = await browser.$(
-        Selectors.CreateCollectionTimeseriesMetaField
+      await browser.setValueVisible(
+        Selectors.CreateCollectionTimeseriesMetaField,
+        collectionOptions.timeseries.metaField
       );
-      await metaField.waitForDisplayed();
-      await metaField.setValue(collectionOptions.timeseries.metaField);
     }
 
     if (collectionOptions.timeseries.granularity) {
@@ -131,31 +128,22 @@ export async function addCollection(
     }
 
     if (collectionOptions.timeseries.bucketMaxSpanSeconds) {
-      const bucketMaxSpanSecondsField = await browser.$(
-        Selectors.CreateCollectionTimeseriesBucketMaxSpanSeconds
-      );
-      await bucketMaxSpanSecondsField.waitForDisplayed();
-      await bucketMaxSpanSecondsField.setValue(
+      await browser.setValueVisible(
+        Selectors.CreateCollectionTimeseriesBucketMaxSpanSeconds,
         collectionOptions.timeseries.bucketMaxSpanSeconds.toString()
       );
     }
 
     if (collectionOptions.timeseries.bucketRoundingSeconds) {
-      const bucketMaxRoundingSecondsField = await browser.$(
-        Selectors.CreateCollectionTimeseriesBucketRoundingSeconds
-      );
-      await bucketMaxRoundingSecondsField.waitForDisplayed();
-      await bucketMaxRoundingSecondsField.setValue(
+      await browser.setValueVisible(
+        Selectors.CreateCollectionTimeseriesBucketRoundingSeconds,
         collectionOptions.timeseries.bucketRoundingSeconds.toString()
       );
     }
 
     if (collectionOptions.timeseries.expireAfterSeconds) {
-      const expireField = await browser.$(
-        Selectors.CreateCollectionTimeseriesExpireAfterSeconds
-      );
-      await expireField.waitForDisplayed();
-      await expireField.setValue(
+      await browser.setValueVisible(
+        Selectors.CreateCollectionTimeseriesExpireAfterSeconds,
         collectionOptions.timeseries.expireAfterSeconds.toString()
       );
     }
@@ -166,17 +154,13 @@ export async function addCollection(
       Selectors.CreateCollectionClusteredCheckboxLabel
     );
 
-    const nameField = await browser.$(
-      Selectors.CreateCollectionClusteredNameField
+    await browser.setValueVisible(
+      Selectors.CreateCollectionClusteredNameField,
+      collectionOptions.clustered.name
     );
-    await nameField.waitForDisplayed();
-    await nameField.setValue(collectionOptions.clustered.name);
 
-    const expireField = await browser.$(
-      Selectors.CreateCollectionClusteredExpireAfterSeconds
-    );
-    await expireField.waitForDisplayed();
-    await expireField.setValue(
+    await browser.setValueVisible(
+      Selectors.CreateCollectionClusteredExpireAfterSeconds,
       collectionOptions.clustered.expireAfterSeconds.toString()
     );
   }

packages/compass-e2e-tests/helpers/commands/add-collection.ts

@@ -12,12 +12,11 @@ export async function addDatabase(
 ): Promise<void> {
   const createModalElement = await browser.$(Selectors.CreateDatabaseModal);
   await createModalElement.waitForDisplayed();
-  const dbInput = await browser.$(Selectors.CreateDatabaseDatabaseName);
-  await dbInput.setValue(dbName);
-  const collectionInput = await browser.$(
-    Selectors.CreateDatabaseCollectionName
+  await browser.setValueVisible(Selectors.CreateDatabaseDatabaseName, dbName);
+  await browser.setValueVisible(
+    Selectors.CreateDatabaseCollectionName,
+    collectionName
   );
-  await collectionInput.setValue(collectionName);
   const createButton = await browser.$(Selectors.CreateDatabaseCreateButton);
   await createButton.waitForEnabled();
 

packages/compass-e2e-tests/helpers/commands/add-database.ts

@@ -1,5 +1,5 @@
 import type { CompassBrowser } from '../compass-browser';
-import type { ChainablePromiseElement, Element } from 'webdriverio';
+import type { ChainablePromiseElement } from 'webdriverio';
 
 interface ClickOptions {
   scroll?: boolean;
@@ -8,11 +8,14 @@ interface ClickOptions {
 
 export async function clickVisible(
   browser: CompassBrowser,
-  selector: string | ChainablePromiseElement<Promise<Element<'async'>>>,
+  selector:
+    | string
+    | ChainablePromiseElement<WebdriverIO.Element>
+    | WebdriverIO.Element,
   options?: ClickOptions
 ): Promise<void> {
-  function getElement() {
-    return typeof selector === 'string' ? browser.$(selector) : selector;
+  async function getElement() {
+    return typeof selector === 'string' ? await browser.$(selector) : selector;
   }
 
   const displayElement = await getElement();

packages/compass-e2e-tests/helpers/commands/click-visible.ts

@@ -18,11 +18,7 @@ async function navigateToCollection(
 
   // search for the collection and wait for the collection to be there and visible
   await browser.clickVisible(Selectors.SidebarFilterInput);
-  const sidebarFilterInputElement = await browser.$(
-    Selectors.SidebarFilterInput
-  );
-  await sidebarFilterInputElement.clearValue();
-  await sidebarFilterInputElement.setValue(collectionName);
+  await browser.setValueVisible(Selectors.SidebarFilterInput, collectionName);
   const collectionElement = await browser.$(collectionSelector);
 
   await collectionElement.waitForDisplayed();

packages/compass-e2e-tests/helpers/commands/collection-workspaces.ts

@@ -8,10 +8,7 @@ export async function dropCollectionFromSidebar(
 ): Promise<void> {
   // search for the collecton in the sidebar filter
   await browser.clickVisible(Selectors.SidebarFilterInput);
-  const sidebarFilterInputElement = await browser.$(
-    Selectors.SidebarFilterInput
-  );
-  await sidebarFilterInputElement.setValue(collectionName);
+  await browser.setValueVisible(Selectors.SidebarFilterInput, collectionName);
   const dbElement = await browser.$(Selectors.sidebarDatabase(dbName));
   await dbElement.waitForDisplayed();
 

packages/compass-e2e-tests/helpers/commands/drop-collection-from-sidebar.ts

@@ -7,10 +7,7 @@ export async function dropDatabaseFromSidebar(
 ): Promise<void> {
   // search for the database in the sidebar filter
   await browser.clickVisible(Selectors.SidebarFilterInput);
-  const sidebarFilterInputElement = await browser.$(
-    Selectors.SidebarFilterInput
-  );
-  await sidebarFilterInputElement.setValue(dbName);
+  await browser.setValueVisible(Selectors.SidebarFilterInput, dbName);
   await browser.$(Selectors.sidebarDatabase(dbName)).waitForDisplayed();
 
   // open the drop database modal from the sidebar

packages/compass-e2e-tests/helpers/commands/drop-database-from-sidebar.ts

@@ -18,11 +18,10 @@ export async function dropIndex(
   const dropModal = await browser.$(Selectors.DropIndexModal);
   await dropModal.waitForDisplayed();
 
-  const confirmInput = await browser.$(
-    Selectors.DropIndexModalConfirmNameInput
+  await browser.setValueVisible(
+    Selectors.DropIndexModalConfirmNameInput,
+    indexName
   );
-  await confirmInput.waitForDisplayed();
-  await confirmInput.setValue(indexName);
 
   if (screenshotName) {
     await browser.screenshot(screenshotName);

packages/compass-e2e-tests/helpers/commands/drop-index.ts

@@ -7,8 +7,10 @@ export async function dropNamespace(
 ): Promise<void> {
   const dropModalElement = await browser.$(Selectors.DropNamespaceModal);
   await dropModalElement.waitForDisplayed();
-  const confirmInput = await browser.$(Selectors.DropNamespaceConfirmNameInput);
-  await confirmInput.setValue(collectionName);
+  await browser.setValueVisible(
+    Selectors.DropNamespaceConfirmNameInput,
+    collectionName
+  );
   const confirmButton = await browser.$(Selectors.DropNamespaceDropButton);
   await confirmButton.waitForEnabled();
 

packages/compass-e2e-tests/helpers/commands/drop-namespace.ts

@@ -73,5 +73,5 @@ export async function exportToLanguage(
   await exportModal.waitForDisplayed({ reverse: true });
 
   // normalize copied text so that it's the same for all platforms
-  return text.replace(/\r\n/g, '\n');
+  return text.replace(/\r\n/g, '\n').replace(/\n+/g, '\n');
 }