@ebertjendustries/cstestwrapper 1.0.26 → 1.0.29

package/dist/index.d.mts

@@ -4,7 +4,6 @@ import { MultiselectWrapper, SelectWrapper, InputWrapper, DatePickerWrapper, Tab
 import { ElementWrapper, ComponentWrapper } from '@cloudscape-design/test-utils-core/dom';
 import DropdownHostComponentWrapper from '@cloudscape-design/components/test-utils/dom/internal/dropdown-host';
 import * as vitest from 'vitest';
-import * as react_jsx_runtime from 'react/jsx-runtime';
 import React from 'react';
 
 /**
@@ -30,8 +29,10 @@ declare class AbstractSelectTesting<SelectWrapperType extends DropdownHostCompon
      */
     expectEntries(entries: string[], selectedIndices: number[]): Promise<void>;
     expectEnumEntries<E extends Object>(enumFactory: EnumFactory<E>, selectedEnums: E[], except?: E[]): Promise<void>;
-    selectOrDeselect(clickedIndices: number[]): Promise<void>;
-    select(entries: string[]): Promise<void>;
+    selectOrDeselectByIndices(clickedIndices: number[]): Promise<void>;
+    selectOrDeselectEnum<E extends Object>(enumFactory: EnumFactory<E>, selectedEntry: E): Promise<void>;
+    multiselectEnums<E extends Object>(enumFactory: EnumFactory<E>, selectedEntries: E[]): Promise<void>;
+    multiselect(entries: string[]): Promise<void>;
     openDropdown(): Promise<SelectWrapperType>;
     closeDropdown(selectWrapper: DropdownHostComponentWrapper): Promise<void>;
     awaitHasSelectedEntryCount(selectedEntryCount: number, totalEntryCount: number): Promise<void>;
@@ -551,6 +552,6 @@ declare class ViewTestWrapperProps<T> {
     initialValue: T;
     view: (value: T, onChange: PropertyChangeFunction) => React.ReactNode;
 }
-declare function ViewTestWrapper<T>(props: ViewTestWrapperProps<T>): react_jsx_runtime.JSX.Element;
+declare function ViewTestWrapper<T>(props: ViewTestWrapperProps<T>): React.JSX.Element;
 
 export { AbstractComponentTesting, AbstractInputTesting, AbstractSelectTesting, AbstractViewTesting, AlertTesting, BoxTesting, ButtonDropdownTesting, ButtonTesting, CSVNoItemsViewTesting, CSVPriceInputViewTesting, CSVSearchFilterViewTesting, CSVTextPromptModalViewTesting, CardsTesting, CheckboxTesting, CollectionPreferencesSetting, CollectionPreferencesTesting, CopyToClipboardTesting, DatePickerTesting, FlashbarTesting, FormTesting, HeaderTesting, IconTesting, LinkTesting, MockBrowserAPIs, MockRestClient, ModalTesting, MultiselectTesting, NumberInputTesting, PaginationTesting, ProgressBarTesting, RatingTesting, SegmentedControlTesting, SelectTesting, StatusIndicatorTesting, StringInputTesting, TableTesting, TabsTesting, TestLocalisation, TestingFactory, TextContentTesting, TextFilterTesting, TextareaTesting, ToggleTesting, ViewTestWrapper, WizardTesting, setupRestClientMock };

package/dist/index.d.ts

@@ -4,7 +4,6 @@ import { MultiselectWrapper, SelectWrapper, InputWrapper, DatePickerWrapper, Tab
 import { ElementWrapper, ComponentWrapper } from '@cloudscape-design/test-utils-core/dom';
 import DropdownHostComponentWrapper from '@cloudscape-design/components/test-utils/dom/internal/dropdown-host';
 import * as vitest from 'vitest';
-import * as react_jsx_runtime from 'react/jsx-runtime';
 import React from 'react';
 
 /**
@@ -30,8 +29,10 @@ declare class AbstractSelectTesting<SelectWrapperType extends DropdownHostCompon
      */
     expectEntries(entries: string[], selectedIndices: number[]): Promise<void>;
     expectEnumEntries<E extends Object>(enumFactory: EnumFactory<E>, selectedEnums: E[], except?: E[]): Promise<void>;
-    selectOrDeselect(clickedIndices: number[]): Promise<void>;
-    select(entries: string[]): Promise<void>;
+    selectOrDeselectByIndices(clickedIndices: number[]): Promise<void>;
+    selectOrDeselectEnum<E extends Object>(enumFactory: EnumFactory<E>, selectedEntry: E): Promise<void>;
+    multiselectEnums<E extends Object>(enumFactory: EnumFactory<E>, selectedEntries: E[]): Promise<void>;
+    multiselect(entries: string[]): Promise<void>;
     openDropdown(): Promise<SelectWrapperType>;
     closeDropdown(selectWrapper: DropdownHostComponentWrapper): Promise<void>;
     awaitHasSelectedEntryCount(selectedEntryCount: number, totalEntryCount: number): Promise<void>;
@@ -551,6 +552,6 @@ declare class ViewTestWrapperProps<T> {
     initialValue: T;
     view: (value: T, onChange: PropertyChangeFunction) => React.ReactNode;
 }
-declare function ViewTestWrapper<T>(props: ViewTestWrapperProps<T>): react_jsx_runtime.JSX.Element;
+declare function ViewTestWrapper<T>(props: ViewTestWrapperProps<T>): React.JSX.Element;
 
 export { AbstractComponentTesting, AbstractInputTesting, AbstractSelectTesting, AbstractViewTesting, AlertTesting, BoxTesting, ButtonDropdownTesting, ButtonTesting, CSVNoItemsViewTesting, CSVPriceInputViewTesting, CSVSearchFilterViewTesting, CSVTextPromptModalViewTesting, CardsTesting, CheckboxTesting, CollectionPreferencesSetting, CollectionPreferencesTesting, CopyToClipboardTesting, DatePickerTesting, FlashbarTesting, FormTesting, HeaderTesting, IconTesting, LinkTesting, MockBrowserAPIs, MockRestClient, ModalTesting, MultiselectTesting, NumberInputTesting, PaginationTesting, ProgressBarTesting, RatingTesting, SegmentedControlTesting, SelectTesting, StatusIndicatorTesting, StringInputTesting, TableTesting, TabsTesting, TestLocalisation, TestingFactory, TextContentTesting, TextFilterTesting, TextareaTesting, ToggleTesting, ViewTestWrapper, WizardTesting, setupRestClientMock };

package/dist/index.js

@@ -288,7 +288,7 @@ var AbstractSelectTesting = class extends AbstractComponentTesting {
     const selectedOptionsText = selectedOptions.map((selectedOption) => selectedOption.findLabel().getElement().textContent);
     console.log(`CURRENTLY selected options = ${selectedOptionsText}, EXPECTED selected options = ${selectedEntries}`);
     const indexDiff = selectedEntries.length === totalEntryCount ? 1 : 0;
-    (0, import_vitest3.expect)(selectedOptions, this.msgForExpect()).toHaveLength(selectedEntries.length + indexDiff);
+    (0, import_vitest3.expect)(selectedOptions, this.msgForExpect(void 0, "expectSelectedEntries - toHaveLength")).toHaveLength(selectedEntries.length + indexDiff);
     const selectedEntriesSet = /* @__PURE__ */ new Set();
     selectedEntries.forEach((entry) => selectedEntriesSet.add(entry));
     for (let index = indexDiff; index < selectedOptionsText.length; index++) {
@@ -297,7 +297,7 @@ var AbstractSelectTesting = class extends AbstractComponentTesting {
       if (!hasElement) {
         console.log(`Expected element at index ${index} to be selected: ${selectedOption}.`);
       }
-      (0, import_vitest3.expect)(hasElement, this.msgForExpect(index)).toBeTruthy();
+      (0, import_vitest3.expect)(hasElement, this.msgForExpect(index, "expectSelectedEntries - hasElement toBeTruthy")).toBeTruthy();
     }
     await this.closeDropdown(selectWrapper);
   }
@@ -312,16 +312,16 @@ var AbstractSelectTesting = class extends AbstractComponentTesting {
    */
   async expectEntries(entries, selectedIndices) {
     selectedIndices = selectedIndices.sort((a, b) => a - b);
-    (0, import_vitest3.expect)(await this.awaitElement(), this.msgForExpect()).toBeInTheDocument();
+    (0, import_vitest3.expect)(await this.awaitElement(), this.msgForExpect(void 0, "expectEntries - toBeInTheDocument")).toBeInTheDocument();
     const selectWrapper = await this.openDropdown();
     const options = this.getDropdown(selectWrapper).findOptions();
-    (0, import_vitest3.expect)(options, this.msgForExpect()).toHaveLength(entries.length);
+    (0, import_vitest3.expect)(options, this.msgForExpect(void 0, "expectEntries - toHaveLength")).toHaveLength(entries.length);
     const selectedOptions = this.getDropdown(selectWrapper).findSelectedOptions();
     const indexDiff = entries.length === selectedIndices.length ? 1 : 0;
-    (0, import_vitest3.expect)(selectedOptions, this.msgForExpect()).toHaveLength(selectedIndices.length + indexDiff);
+    (0, import_vitest3.expect)(selectedOptions, this.msgForExpect(void 0, "expectEntries - selectedOptions toHaveLength")).toHaveLength(selectedIndices.length + indexDiff);
     for (let index = indexDiff; index < selectedOptions.length; index++) {
       const selectedOption = selectedOptions[index];
-      (0, import_vitest3.expect)(selectedOption.findLabel().getElement().textContent, this.msgForExpect(index)).toBe(entries[selectedIndices[index - indexDiff]]);
+      (0, import_vitest3.expect)(selectedOption.findLabel().getElement().textContent, this.msgForExpect(index, "expectEntries - to have label")).toBe(entries[selectedIndices[index - indexDiff]]);
     }
     await this.closeDropdown(selectWrapper);
   }
@@ -334,8 +334,8 @@ var AbstractSelectTesting = class extends AbstractComponentTesting {
       selectedOptionIndices
     );
   }
-  async selectOrDeselect(clickedIndices) {
-    (0, import_vitest3.expect)(await this.awaitElement(), this.msgForExpect()).toBeInTheDocument();
+  async selectOrDeselectByIndices(clickedIndices) {
+    (0, import_vitest3.expect)(await this.awaitElement(), this.msgForExpect(void 0, "selectOrDeselect - toBeInTheDocument")).toBeInTheDocument();
     const sortedIndices = clickedIndices.sort((a, b) => b - a);
     const selectWrapper = await this.openDropdown();
     for (let index = 0; index < sortedIndices.length; index++) {
@@ -344,8 +344,15 @@ var AbstractSelectTesting = class extends AbstractComponentTesting {
     }
     await this.closeDropdown(selectWrapper);
   }
+  async selectOrDeselectEnum(enumFactory, selectedEntry) {
+    await this.selectOrDeselectByIndices([enumFactory.getEnumIndex(selectedEntry)]);
+  }
+  async multiselectEnums(enumFactory, selectedEntries) {
+    const localiser = this.view.getLocaliser();
+    await this.multiselect(selectedEntries.map((entry) => localiser.getEnumLabel(enumFactory, entry)));
+  }
   // ATTENTION! Do NOT use with enum single select! It will lead to failing tests as it does not change selection.
-  async select(entries) {
+  async multiselect(entries) {
     console.log("SELECTING options = " + entries);
     const indicesToSelect = [];
     const indicesToDeselect = [];
@@ -363,29 +370,29 @@ var AbstractSelectTesting = class extends AbstractComponentTesting {
         indicesToDeselect.push(index);
       }
     }
-    await this.selectOrDeselect(indicesToSelect);
-    await this.selectOrDeselect(indicesToDeselect);
+    await this.selectOrDeselectByIndices(indicesToSelect);
+    await this.selectOrDeselectByIndices(indicesToDeselect);
     await this.closeDropdown(await this.openDropdown());
   }
   async openDropdown() {
     const selectWrapper = this.getElementWrapper();
     (0, import_react5.act)(() => selectWrapper.openDropdown());
-    await (0, import_react4.waitFor)(() => (0, import_vitest3.expect)(this.getDropdown(selectWrapper).findOptions().length, this.msgForExpect()).toBeGreaterThan(0));
+    await (0, import_react4.waitFor)(() => (0, import_vitest3.expect)(this.getDropdown(selectWrapper).findOptions().length, this.msgForExpect(void 0, "openDropdown - wait till options are present")).toBeGreaterThan(0));
     return selectWrapper;
   }
   async closeDropdown(selectWrapper) {
     (0, import_react5.act)(() => selectWrapper.closeDropdown(this.getOptions()));
     if (!this.expandToViewport) {
-      await (0, import_react4.waitFor)(() => (0, import_vitest3.expect)(this.getDropdown(selectWrapper).findOptions().length, this.msgForExpect()).toBe(0));
+      await (0, import_react4.waitFor)(() => (0, import_vitest3.expect)(this.getDropdown(selectWrapper).findOptions().length, this.msgForExpect(void 0, "closeDropdown - wait till options are gone")).toBe(0));
     }
   }
   async awaitHasSelectedEntryCount(selectedEntryCount, totalEntryCount) {
     const selectWrapper = await this.openDropdown();
     const options = this.getDropdown(selectWrapper).findSelectedOptions();
     if (selectedEntryCount === totalEntryCount) {
-      (0, import_vitest3.expect)(options, this.msgForExpect()).toHaveLength(selectedEntryCount + 1);
+      (0, import_vitest3.expect)(options, this.msgForExpect(void 0, "awaitHasSelectedEntryCount - all selected")).toHaveLength(selectedEntryCount + 1);
     } else {
-      (0, import_vitest3.expect)(options, this.msgForExpect()).toHaveLength(selectedEntryCount);
+      (0, import_vitest3.expect)(options, this.msgForExpect(void 0, "awaitHasSelectedEntryCount - specific items selected")).toHaveLength(selectedEntryCount);
     }
     await this.closeDropdown(selectWrapper);
   }
@@ -1530,7 +1537,7 @@ var CSVPriceInputViewTesting = class extends AbstractViewTesting {
       const priceX = price.priceInCents / 100;
       this.csvPriceInputView.elements.amountInput.setStringValue(priceX.toString());
     }
-    await this.csvPriceInputView.elements.currencyInput.selectOrDeselect([this.currencyFactory.getEnumIndex(price.currency)]);
+    await this.csvPriceInputView.elements.currencyInput.selectOrDeselectByIndices([this.currencyFactory.getEnumIndex(price.currency)]);
   }
   async expectPrice(price) {
     if (isNaN(price.priceInCents)) {

package/dist/index.mjs

@@ -207,7 +207,7 @@ var AbstractSelectTesting = class extends AbstractComponentTesting {
     const selectedOptionsText = selectedOptions.map((selectedOption) => selectedOption.findLabel().getElement().textContent);
     console.log(`CURRENTLY selected options = ${selectedOptionsText}, EXPECTED selected options = ${selectedEntries}`);
     const indexDiff = selectedEntries.length === totalEntryCount ? 1 : 0;
-    expect3(selectedOptions, this.msgForExpect()).toHaveLength(selectedEntries.length + indexDiff);
+    expect3(selectedOptions, this.msgForExpect(void 0, "expectSelectedEntries - toHaveLength")).toHaveLength(selectedEntries.length + indexDiff);
     const selectedEntriesSet = /* @__PURE__ */ new Set();
     selectedEntries.forEach((entry) => selectedEntriesSet.add(entry));
     for (let index = indexDiff; index < selectedOptionsText.length; index++) {
@@ -216,7 +216,7 @@ var AbstractSelectTesting = class extends AbstractComponentTesting {
       if (!hasElement) {
         console.log(`Expected element at index ${index} to be selected: ${selectedOption}.`);
       }
-      expect3(hasElement, this.msgForExpect(index)).toBeTruthy();
+      expect3(hasElement, this.msgForExpect(index, "expectSelectedEntries - hasElement toBeTruthy")).toBeTruthy();
     }
     await this.closeDropdown(selectWrapper);
   }
@@ -231,16 +231,16 @@ var AbstractSelectTesting = class extends AbstractComponentTesting {
    */
   async expectEntries(entries, selectedIndices) {
     selectedIndices = selectedIndices.sort((a, b) => a - b);
-    expect3(await this.awaitElement(), this.msgForExpect()).toBeInTheDocument();
+    expect3(await this.awaitElement(), this.msgForExpect(void 0, "expectEntries - toBeInTheDocument")).toBeInTheDocument();
     const selectWrapper = await this.openDropdown();
     const options = this.getDropdown(selectWrapper).findOptions();
-    expect3(options, this.msgForExpect()).toHaveLength(entries.length);
+    expect3(options, this.msgForExpect(void 0, "expectEntries - toHaveLength")).toHaveLength(entries.length);
     const selectedOptions = this.getDropdown(selectWrapper).findSelectedOptions();
     const indexDiff = entries.length === selectedIndices.length ? 1 : 0;
-    expect3(selectedOptions, this.msgForExpect()).toHaveLength(selectedIndices.length + indexDiff);
+    expect3(selectedOptions, this.msgForExpect(void 0, "expectEntries - selectedOptions toHaveLength")).toHaveLength(selectedIndices.length + indexDiff);
     for (let index = indexDiff; index < selectedOptions.length; index++) {
       const selectedOption = selectedOptions[index];
-      expect3(selectedOption.findLabel().getElement().textContent, this.msgForExpect(index)).toBe(entries[selectedIndices[index - indexDiff]]);
+      expect3(selectedOption.findLabel().getElement().textContent, this.msgForExpect(index, "expectEntries - to have label")).toBe(entries[selectedIndices[index - indexDiff]]);
     }
     await this.closeDropdown(selectWrapper);
   }
@@ -253,8 +253,8 @@ var AbstractSelectTesting = class extends AbstractComponentTesting {
       selectedOptionIndices
     );
   }
-  async selectOrDeselect(clickedIndices) {
-    expect3(await this.awaitElement(), this.msgForExpect()).toBeInTheDocument();
+  async selectOrDeselectByIndices(clickedIndices) {
+    expect3(await this.awaitElement(), this.msgForExpect(void 0, "selectOrDeselect - toBeInTheDocument")).toBeInTheDocument();
     const sortedIndices = clickedIndices.sort((a, b) => b - a);
     const selectWrapper = await this.openDropdown();
     for (let index = 0; index < sortedIndices.length; index++) {
@@ -263,8 +263,15 @@ var AbstractSelectTesting = class extends AbstractComponentTesting {
     }
     await this.closeDropdown(selectWrapper);
   }
+  async selectOrDeselectEnum(enumFactory, selectedEntry) {
+    await this.selectOrDeselectByIndices([enumFactory.getEnumIndex(selectedEntry)]);
+  }
+  async multiselectEnums(enumFactory, selectedEntries) {
+    const localiser = this.view.getLocaliser();
+    await this.multiselect(selectedEntries.map((entry) => localiser.getEnumLabel(enumFactory, entry)));
+  }
   // ATTENTION! Do NOT use with enum single select! It will lead to failing tests as it does not change selection.
-  async select(entries) {
+  async multiselect(entries) {
     console.log("SELECTING options = " + entries);
     const indicesToSelect = [];
     const indicesToDeselect = [];
@@ -282,29 +289,29 @@ var AbstractSelectTesting = class extends AbstractComponentTesting {
         indicesToDeselect.push(index);
       }
     }
-    await this.selectOrDeselect(indicesToSelect);
-    await this.selectOrDeselect(indicesToDeselect);
+    await this.selectOrDeselectByIndices(indicesToSelect);
+    await this.selectOrDeselectByIndices(indicesToDeselect);
     await this.closeDropdown(await this.openDropdown());
   }
   async openDropdown() {
     const selectWrapper = this.getElementWrapper();
     act2(() => selectWrapper.openDropdown());
-    await waitFor2(() => expect3(this.getDropdown(selectWrapper).findOptions().length, this.msgForExpect()).toBeGreaterThan(0));
+    await waitFor2(() => expect3(this.getDropdown(selectWrapper).findOptions().length, this.msgForExpect(void 0, "openDropdown - wait till options are present")).toBeGreaterThan(0));
     return selectWrapper;
   }
   async closeDropdown(selectWrapper) {
     act2(() => selectWrapper.closeDropdown(this.getOptions()));
     if (!this.expandToViewport) {
-      await waitFor2(() => expect3(this.getDropdown(selectWrapper).findOptions().length, this.msgForExpect()).toBe(0));
+      await waitFor2(() => expect3(this.getDropdown(selectWrapper).findOptions().length, this.msgForExpect(void 0, "closeDropdown - wait till options are gone")).toBe(0));
     }
   }
   async awaitHasSelectedEntryCount(selectedEntryCount, totalEntryCount) {
     const selectWrapper = await this.openDropdown();
     const options = this.getDropdown(selectWrapper).findSelectedOptions();
     if (selectedEntryCount === totalEntryCount) {
-      expect3(options, this.msgForExpect()).toHaveLength(selectedEntryCount + 1);
+      expect3(options, this.msgForExpect(void 0, "awaitHasSelectedEntryCount - all selected")).toHaveLength(selectedEntryCount + 1);
     } else {
-      expect3(options, this.msgForExpect()).toHaveLength(selectedEntryCount);
+      expect3(options, this.msgForExpect(void 0, "awaitHasSelectedEntryCount - specific items selected")).toHaveLength(selectedEntryCount);
     }
     await this.closeDropdown(selectWrapper);
   }
@@ -1449,7 +1456,7 @@ var CSVPriceInputViewTesting = class extends AbstractViewTesting {
       const priceX = price.priceInCents / 100;
       this.csvPriceInputView.elements.amountInput.setStringValue(priceX.toString());
     }
-    await this.csvPriceInputView.elements.currencyInput.selectOrDeselect([this.currencyFactory.getEnumIndex(price.currency)]);
+    await this.csvPriceInputView.elements.currencyInput.selectOrDeselectByIndices([this.currencyFactory.getEnumIndex(price.currency)]);
   }
   async expectPrice(price) {
     if (isNaN(price.priceInCents)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ebertjendustries/cstestwrapper",
-  "version": "1.0.26",
+  "version": "1.0.29",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
@@ -16,7 +16,7 @@
   "license": "MIT",
   "peerDependencies": {
     "@cloudscape-design/collection-hooks": "^1.0.82",
-    "@cloudscape-design/components": "^3.0.1204",
+    "@cloudscape-design/components": "^3.0.1214",
     "@cloudscape-design/design-tokens": "^3.0.70",
     "@cloudscape-design/global-styles": "^1.0.50",
     "@cloudscape-design/test-utils-core": "^1.0.71",
@@ -37,7 +37,7 @@
     "@cloudscape-design/design-tokens": "^3.0.70",
     "@cloudscape-design/global-styles": "^1.0.50",
     "@cloudscape-design/test-utils-core": "^1.0.71",
-    "@ebertjendustries/cswrapper": "^1.0.27",
+    "@ebertjendustries/cswrapper": "^1.0.29",
     "@smastrom/react-rating": "^1.5.0",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.6.3",