diff --git a/.testcafe/Models/homePageModel.js b/.testcafe/Models/homePageModel.js index 8e400c7e6..5416a9738 100644 --- a/.testcafe/Models/homePageModel.js +++ b/.testcafe/Models/homePageModel.js @@ -2,10 +2,10 @@ import { Selector, t } from "testcafe"; export default class HomePage { constructor() { - this.header = Selector('[data-tc="home-header"]'); - this.catalogMenu = Selector('[data-tc="Catalog"]'); + this.header = Selector('[data-test="home-header"]'); + this.catalogMenu = Selector('[data-test="Catalog"]'); this.productsSubMenu = Selector( - '[data-tc="catalogue"]>[aria-label="products"]' + '[data-test="catalogue"]>[aria-label="products"]' ); } } diff --git a/.testcafe/Models/loginPageModel.js b/.testcafe/Models/loginPageModel.js index 5447a6fdb..117ac9e32 100644 --- a/.testcafe/Models/loginPageModel.js +++ b/.testcafe/Models/loginPageModel.js @@ -2,9 +2,9 @@ import { Selector, t } from "testcafe"; export default class LoginPage { constructor() { - this.email = Selector('[data-tc="email"]'); - this.password = Selector('[data-tc="password"]'); - this.submitButton = Selector('[data-tc="submit"]'); + this.email = Selector('[data-test="email"]'); + this.password = Selector('[data-test="password"]'); + this.submitButton = Selector('[data-test="submit"]'); } async performLogin(putEmail, putPassword) { diff --git a/src/attributes/components/AttributeList/AttributeList.tsx b/src/attributes/components/AttributeList/AttributeList.tsx index bf29ea4d9..211c374ce 100644 --- a/src/attributes/components/AttributeList/AttributeList.tsx +++ b/src/attributes/components/AttributeList/AttributeList.tsx @@ -193,9 +193,9 @@ const AttributeList: React.FC = ({ key={attribute ? attribute.id : "skeleton"} onClick={attribute && onRowClick(attribute.id)} className={classes.link} - data-tc="id" - data-tc-id={maybe(() => attribute.id)} - data-tc-values={JSON.stringify( + data-test="id" + data-test-id={maybe(() => attribute.id)} + data-test-values={JSON.stringify( maybe(() => attribute.values, []) )} > @@ -207,16 +207,16 @@ const AttributeList: React.FC = ({ onChange={() => toggle(attribute.id)} /> - + {attribute ? attribute.slug : } - + {attribute ? attribute.name : } attribute.visibleInStorefront)} + data-test="visible" + data-test-visible={maybe(() => attribute.visibleInStorefront)} > {attribute ? ( translateBoolean(attribute.visibleInStorefront, intl) @@ -226,8 +226,8 @@ const AttributeList: React.FC = ({ attribute.filterableInDashboard )} > @@ -239,8 +239,8 @@ const AttributeList: React.FC = ({ attribute.filterableInStorefront )} > diff --git a/src/auth/components/LoginPage/LoginPage.tsx b/src/auth/components/LoginPage/LoginPage.tsx index 60f1d9d19..2e4221fa2 100644 --- a/src/auth/components/LoginPage/LoginPage.tsx +++ b/src/auth/components/LoginPage/LoginPage.tsx @@ -82,7 +82,7 @@ const LoginCard: React.FC = props => { onChange={handleChange} value={data.email} inputProps={{ - "data-tc": "email" + "data-test": "email" }} /> @@ -97,7 +97,7 @@ const LoginCard: React.FC = props => { type="password" value={data.password} inputProps={{ - "data-tc": "password" + "data-test": "password" }} /> @@ -109,7 +109,7 @@ const LoginCard: React.FC = props => { variant="contained" onClick={handleSubmit} type="submit" - data-tc="submit" + data-test="submit" > diff --git a/src/auth/components/NewPasswordPage/NewPasswordPage.tsx b/src/auth/components/NewPasswordPage/NewPasswordPage.tsx index 1f9e9617c..ba9966675 100644 --- a/src/auth/components/NewPasswordPage/NewPasswordPage.tsx +++ b/src/auth/components/NewPasswordPage/NewPasswordPage.tsx @@ -86,7 +86,7 @@ const NewPasswordPage: React.FC = props => { type="password" value={data.password} inputProps={{ - "data-tc": "password" + "data-test": "password" }} /> @@ -109,7 +109,7 @@ const NewPasswordPage: React.FC = props => { }) } inputProps={{ - "data-tc": "confirm-password" + "data-test": "confirm-password" }} /> diff --git a/src/auth/components/ResetPasswordPage/ResetPasswordPage.tsx b/src/auth/components/ResetPasswordPage/ResetPasswordPage.tsx index d7f297011..7502ec631 100644 --- a/src/auth/components/ResetPasswordPage/ResetPasswordPage.tsx +++ b/src/auth/components/ResetPasswordPage/ResetPasswordPage.tsx @@ -68,7 +68,7 @@ const ResetPasswordPage: React.FC = props => { onChange={handleChange} value={data.email} inputProps={{ - "data-tc": "email" + "data-test": "email" }} /> diff --git a/src/categories/components/CategoryList/CategoryList.tsx b/src/categories/components/CategoryList/CategoryList.tsx index 48c79af01..39d1d8d28 100644 --- a/src/categories/components/CategoryList/CategoryList.tsx +++ b/src/categories/components/CategoryList/CategoryList.tsx @@ -165,8 +165,8 @@ const CategoryList: React.FC = props => { onClick={category ? onRowClick(category.id) : undefined} key={category ? category.id : "skeleton"} selected={isSelected} - data-tc="id" - data-tc-id={maybe(() => category.id)} + data-test="id" + data-test-id={maybe(() => category.id)} > = props => { onChange={() => toggle(category.id)} /> - + {category && category.name ? category.name : } diff --git a/src/collections/components/CollectionList/CollectionList.tsx b/src/collections/components/CollectionList/CollectionList.tsx index 34f9fb65f..d46c53de0 100644 --- a/src/collections/components/CollectionList/CollectionList.tsx +++ b/src/collections/components/CollectionList/CollectionList.tsx @@ -150,8 +150,8 @@ const CollectionList: React.FC = props => { onClick={collection ? onRowClick(collection.id) : undefined} key={collection ? collection.id : "skeleton"} selected={isSelected} - data-tc="id" - data-tc-id={maybe(() => collection.id)} + data-test="id" + data-test-id={maybe(() => collection.id)} > = props => { onChange={() => toggle(collection.id)} /> - + {maybe(() => collection.name, )} @@ -172,8 +172,8 @@ const CollectionList: React.FC = props => { collection.isPublished)} + data-test="published" + data-test-published={maybe(() => collection.isPublished)} > {maybe( () => ( diff --git a/src/components/AccountPermissionGroups/AccountPermissionGroups.tsx b/src/components/AccountPermissionGroups/AccountPermissionGroups.tsx index f3b783e3b..3c294de5e 100644 --- a/src/components/AccountPermissionGroups/AccountPermissionGroups.tsx +++ b/src/components/AccountPermissionGroups/AccountPermissionGroups.tsx @@ -59,7 +59,7 @@ const AccountPermissionGroups: React.FC = props => value={formData?.permissionGroups} onChange={onChange} fetchChoices={onSearchChange} - data-tc="permissionGroups" + data-test="permissionGroups" onFetchMore={onFetchMore} hasMore={hasMore} loading={loading} diff --git a/src/components/AppLayout/MenuList.tsx b/src/components/AppLayout/MenuList.tsx index 035c9f2c0..3fd970828 100644 --- a/src/components/AppLayout/MenuList.tsx +++ b/src/components/AppLayout/MenuList.tsx @@ -264,7 +264,7 @@ const MenuList: React.FC = props => { menuItem.ariaLabel === activeSubMenu.label && activeSubMenu.isActive })} - data-tc={menuItem.label} + data-test={menuItem.label} onClick={() => handleSubMenu(menuItem.ariaLabel)} > = props => { className={classNames(classes.menuListNestedClose, { [classes.menuListNestedCloseDark]: isDark })} - data-tc={ariaLabel} + data-test={ariaLabel} onClick={() => closeSubMenu({ isActive: false, @@ -178,7 +178,7 @@ const MenuNested: React.FC = props => { closeMenu(item.url, event)} key={item.label} > diff --git a/src/components/CompanyAddressInput/CompanyAddressForm.tsx b/src/components/CompanyAddressInput/CompanyAddressForm.tsx index 53d4f3ac5..d5252a310 100644 --- a/src/components/CompanyAddressInput/CompanyAddressForm.tsx +++ b/src/components/CompanyAddressInput/CompanyAddressForm.tsx @@ -160,7 +160,7 @@ const CompanyAddressForm: React.FC = props => { choices={countries} InputProps={{ inputProps: { - autocomplete: "plsdontautocomplete" // Somehow it shuts it down + autoComplete: "none" } }} /> diff --git a/src/components/ImageTile/ImageTile.tsx b/src/components/ImageTile/ImageTile.tsx index dcd20a2f4..f6bb80d2b 100644 --- a/src/components/ImageTile/ImageTile.tsx +++ b/src/components/ImageTile/ImageTile.tsx @@ -70,7 +70,7 @@ const ImageTile: React.FC = props => { const classes = useStyles(props); return ( -
+
= ({ selected={choice.value === value} key={choice.value} onClick={() => handleChange(choice.value)} - data-tc="select-option" + data-test="select-option" > {choice.label} diff --git a/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectFieldContent.tsx b/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectFieldContent.tsx index 2a69f20cd..a68f71221 100644 --- a/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectFieldContent.tsx +++ b/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectFieldContent.tsx @@ -210,7 +210,7 @@ const MultiAutocompleteSelectFieldContent: React.FC @@ -225,7 +225,7 @@ const MultiAutocompleteSelectFieldContent: React.FC diff --git a/src/components/SaveButtonBar/SaveButtonBar.tsx b/src/components/SaveButtonBar/SaveButtonBar.tsx index c4ada8be0..31944dfe1 100644 --- a/src/components/SaveButtonBar/SaveButtonBar.tsx +++ b/src/components/SaveButtonBar/SaveButtonBar.tsx @@ -104,7 +104,7 @@ export const SaveButtonBar: React.FC = props => { variant="contained" onClick={onDelete} className={classes.deleteButton} - data-tc="button-bar-delete" + data-test="button-bar-delete" > {labels && labels.delete ? labels.delete @@ -116,7 +116,7 @@ export const SaveButtonBar: React.FC = props => { className={classes.cancelButton} variant="text" onClick={onCancel} - data-tc="button-bar-cancel" + data-test="button-bar-cancel" > {maybe( () => labels.cancel, @@ -127,7 +127,7 @@ export const SaveButtonBar: React.FC = props => { disabled={disabled} onClick={onSave} transitionState={state} - data-tc="button-bar-confirm" + data-test="button-bar-confirm" > {maybe( () => labels.save, diff --git a/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectFieldContent.tsx b/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectFieldContent.tsx index 5453b90e1..9a6794d65 100644 --- a/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectFieldContent.tsx +++ b/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectFieldContent.tsx @@ -175,7 +175,7 @@ const SingleAutocompleteSelectFieldContent: React.FC @@ -189,7 +189,7 @@ const SingleAutocompleteSelectFieldContent: React.FC @@ -205,7 +205,7 @@ const SingleAutocompleteSelectFieldContent: React.FC {suggestion.label} @@ -256,7 +256,7 @@ const SingleAutocompleteSelectFieldContent: React.FC diff --git a/src/components/TablePagination/TablePaginationActions.tsx b/src/components/TablePagination/TablePaginationActions.tsx index 8d83749e3..0fd037f77 100644 --- a/src/components/TablePagination/TablePaginationActions.tsx +++ b/src/components/TablePagination/TablePaginationActions.tsx @@ -87,7 +87,7 @@ export const TablePaginationActions: React.FC = pro })} onClick={onPreviousPage} disabled={!hasPreviousPage} - data-tc="button-pagination-back" + data-test="button-pagination-back" {...backIconButtonProps} > {direction === "rtl" ? : } @@ -99,7 +99,7 @@ export const TablePaginationActions: React.FC = pro })} onClick={onNextPage} disabled={!hasNextPage} - data-tc="button-pagination-next" + data-test="button-pagination-next" {...nextIconButtonProps} > {direction === "rtl" ? : } diff --git a/src/components/messages/MessageManager.tsx b/src/components/messages/MessageManager.tsx index cbc604c71..27b4b0210 100644 --- a/src/components/messages/MessageManager.tsx +++ b/src/components/messages/MessageManager.tsx @@ -73,7 +73,7 @@ export class MessageManager extends React.Component<{}, MessageManagerState> { "aria-describedby": "message-id" }} message={ - + {title && ( {title} @@ -90,7 +90,7 @@ export class MessageManager extends React.Component<{}, MessageManagerState> { color="secondary" size="small" onClick={this.handleClose as any} - data-tc="button-undo" + data-test="button-undo" > UNDO diff --git a/src/home/components/HomeHeader/HomeHeader.tsx b/src/home/components/HomeHeader/HomeHeader.tsx index 579f0d63a..31a57a4ae 100644 --- a/src/home/components/HomeHeader/HomeHeader.tsx +++ b/src/home/components/HomeHeader/HomeHeader.tsx @@ -29,7 +29,7 @@ const HomeOrdersCard: React.FC = props => { const classes = useStyles(props); return ( -
+
{userName ? ( = props => { /> - + = props => { {errors.length > 0 && ( <> - {errors.map(err => ( - + {errors.map((err, index) => ( + {getOrderErrorMessage(err, intl)} ))} diff --git a/src/orders/components/OrderDraftCancelDialog/OrderDraftCancelDialog.tsx b/src/orders/components/OrderDraftCancelDialog/OrderDraftCancelDialog.tsx index 0c8737829..ff22afe31 100644 --- a/src/orders/components/OrderDraftCancelDialog/OrderDraftCancelDialog.tsx +++ b/src/orders/components/OrderDraftCancelDialog/OrderDraftCancelDialog.tsx @@ -40,7 +40,7 @@ const OrderDraftCancelDialog: React.FC = ({ })} variant="delete" > - + = ({ {errors.length > 0 && ( <> - {errors.map(err => ( - + {errors.map((err, index) => ( + {getOrderErrorMessage(err, intl)} ))} diff --git a/src/orders/components/OrderDraftFinalizeDialog/OrderDraftFinalizeDialog.tsx b/src/orders/components/OrderDraftFinalizeDialog/OrderDraftFinalizeDialog.tsx index 3d65a8d1f..58a569efe 100644 --- a/src/orders/components/OrderDraftFinalizeDialog/OrderDraftFinalizeDialog.tsx +++ b/src/orders/components/OrderDraftFinalizeDialog/OrderDraftFinalizeDialog.tsx @@ -109,8 +109,8 @@ const OrderDraftFinalizeDialog: React.FC = ({ {errors.length > 0 && ( <> - {errors.map(err => ( - + {errors.map((err, index) => ( + {getOrderErrorMessage(err, intl)} ))} diff --git a/src/orders/components/OrderFulfillPage/OrderFulfillPage.tsx b/src/orders/components/OrderFulfillPage/OrderFulfillPage.tsx index b2535e5cb..dee9de540 100644 --- a/src/orders/components/OrderFulfillPage/OrderFulfillPage.tsx +++ b/src/orders/components/OrderFulfillPage/OrderFulfillPage.tsx @@ -260,7 +260,7 @@ const OrderFulfillPage: React.FC = props => { (line, lineIndex) => { if (!line) { return ( - + @@ -326,6 +326,7 @@ const OrderFulfillPage: React.FC = props => { if (!warehouseStock) { return ( = props => { .variant.trackInventory } ), - max: + max: ( line.variant.trackInventory && - warehouseStock.quantity, + warehouseStock.quantity + ).toString(), min: 0, style: { textAlign: "right" } }} @@ -409,7 +411,10 @@ const OrderFulfillPage: React.FC = props => { ); })} - + {errors.length > 0 && ( <> - {errors.map(err => ( - + {errors.map((err, index) => ( + {getOrderErrorMessage(err, intl)} ))} diff --git a/src/orders/components/OrderFulfillmentDialog/OrderFulfillmentDialog.tsx b/src/orders/components/OrderFulfillmentDialog/OrderFulfillmentDialog.tsx index 93e0e5665..32fb30a4e 100644 --- a/src/orders/components/OrderFulfillmentDialog/OrderFulfillmentDialog.tsx +++ b/src/orders/components/OrderFulfillmentDialog/OrderFulfillmentDialog.tsx @@ -164,7 +164,7 @@ const OrderFulfillmentDialog: React.FC = props => { = props => { {errors .filter(err => !formFields.includes(err.field)) - .map(err => ( - + .map((err, index) => ( + {getOrderErrorMessage(err, intl)} ))} diff --git a/src/orders/components/OrderFulfillmentTrackingDialog/OrderFulfillmentTrackingDialog.tsx b/src/orders/components/OrderFulfillmentTrackingDialog/OrderFulfillmentTrackingDialog.tsx index 734c8a205..d6b32e1d8 100644 --- a/src/orders/components/OrderFulfillmentTrackingDialog/OrderFulfillmentTrackingDialog.tsx +++ b/src/orders/components/OrderFulfillmentTrackingDialog/OrderFulfillmentTrackingDialog.tsx @@ -76,8 +76,8 @@ const OrderFulfillmentTrackingDialog: React.FC {errors .filter(err => !formFields.includes(err.field)) - .map(err => ( - + .map((err, index) => ( + {getOrderErrorMessage(err, intl)} ))} diff --git a/src/orders/components/OrderMarkAsPaidDialog/OrderMarkAsPaidDialog.tsx b/src/orders/components/OrderMarkAsPaidDialog/OrderMarkAsPaidDialog.tsx index c71686855..3cf3eaed8 100644 --- a/src/orders/components/OrderMarkAsPaidDialog/OrderMarkAsPaidDialog.tsx +++ b/src/orders/components/OrderMarkAsPaidDialog/OrderMarkAsPaidDialog.tsx @@ -43,8 +43,8 @@ const OrderMarkAsPaidDialog: React.FC = ({ {errors.length > 0 && ( <> - {errors.map(err => ( - + {errors.map((err, index) => ( + {getOrderErrorMessage(err, intl)} ))} diff --git a/src/orders/components/OrderPaymentDialog/OrderPaymentDialog.tsx b/src/orders/components/OrderPaymentDialog/OrderPaymentDialog.tsx index 72f5b3ccc..d4e59c1bc 100644 --- a/src/orders/components/OrderPaymentDialog/OrderPaymentDialog.tsx +++ b/src/orders/components/OrderPaymentDialog/OrderPaymentDialog.tsx @@ -88,8 +88,8 @@ const OrderPaymentDialog: React.FC = ({ {errors .filter(err => !formFields.includes(err.field)) - .map(err => ( - + .map((err, index) => ( + {getOrderErrorMessage(err, intl)} ))} diff --git a/src/orders/components/OrderPaymentVoidDialog/OrderPaymentVoidDialog.tsx b/src/orders/components/OrderPaymentVoidDialog/OrderPaymentVoidDialog.tsx index 7bb7dd6e9..ab812154d 100644 --- a/src/orders/components/OrderPaymentVoidDialog/OrderPaymentVoidDialog.tsx +++ b/src/orders/components/OrderPaymentVoidDialog/OrderPaymentVoidDialog.tsx @@ -46,8 +46,8 @@ const OrderPaymentVoidDialog: React.FC = ({ {errors.length > 0 && ( <> - {errors.map(err => ( - + {errors.map((err, index) => ( + {getOrderErrorMessage(err, intl)} ))} diff --git a/src/orders/components/OrderProductAddDialog/OrderProductAddDialog.tsx b/src/orders/components/OrderProductAddDialog/OrderProductAddDialog.tsx index 831202d3e..c97b3a778 100644 --- a/src/orders/components/OrderProductAddDialog/OrderProductAddDialog.tsx +++ b/src/orders/components/OrderProductAddDialog/OrderProductAddDialog.tsx @@ -340,8 +340,8 @@ const OrderProductAddDialog: React.FC = props => { {errors.length > 0 && ( <> - {errors.map(err => ( - + {errors.map((err, index) => ( + {getOrderErrorMessage(err, intl)} ))} diff --git a/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx b/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx index baaad1842..73a40ce01 100644 --- a/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx +++ b/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx @@ -120,8 +120,8 @@ const OrderShippingMethodEditDialog: React.FC 0 && ( <> - {nonFieldErrors.map(err => ( - + {nonFieldErrors.map((err, index) => ( + {getOrderErrorMessage(err, intl)} ))} diff --git a/src/permissionGroups/components/PermissionGroupList/PermissionGroupList.tsx b/src/permissionGroups/components/PermissionGroupList/PermissionGroupList.tsx index 91c826af1..cd0c2061d 100644 --- a/src/permissionGroups/components/PermissionGroupList/PermissionGroupList.tsx +++ b/src/permissionGroups/components/PermissionGroupList/PermissionGroupList.tsx @@ -125,19 +125,21 @@ const PermissionGroupList: React.FC = props => { onClick={ permissionGroup ? onRowClick(permissionGroup.id) : undefined } - data-tc="id" - data-tc-id={maybe(() => permissionGroup.id)} + data-test="id" + data-test-id={maybe(() => permissionGroup.id)} > {permissionGroup ? ( - {permissionGroup.name} + {permissionGroup.name} ) : ( )} {permissionGroup ? ( - {permissionGroup.users.length} + + {permissionGroup.users.length} + ) : ( )} diff --git a/src/productTypes/components/ProductTypeAttributes/ProductTypeAttributes.tsx b/src/productTypes/components/ProductTypeAttributes/ProductTypeAttributes.tsx index c44727b83..0487366bc 100644 --- a/src/productTypes/components/ProductTypeAttributes/ProductTypeAttributes.tsx +++ b/src/productTypes/components/ProductTypeAttributes/ProductTypeAttributes.tsx @@ -83,7 +83,7 @@ const ProductTypeAttributes: React.FC = props => { return ( = props => { } key={maybe(() => attribute.id)} index={attributeIndex || 0} - data-tc="id" - data-tc-id={maybe(() => attribute.id)} + data-test="id" + data-test-id={maybe(() => attribute.id)} > = props => { onChange={() => toggle(attribute.id)} /> - + {maybe(() => attribute.name) ? ( attribute.name ) : ( )} - + {maybe(() => attribute.slug) ? ( attribute.slug ) : ( diff --git a/src/productTypes/components/ProductTypeList/ProductTypeList.tsx b/src/productTypes/components/ProductTypeList/ProductTypeList.tsx index 17023f45c..14eefbdad 100644 --- a/src/productTypes/components/ProductTypeList/ProductTypeList.tsx +++ b/src/productTypes/components/ProductTypeList/ProductTypeList.tsx @@ -142,8 +142,8 @@ const ProductTypeList: React.FC = props => { key={productType ? productType.id : "skeleton"} onClick={productType ? onRowClick(productType.id) : undefined} selected={isSelected} - data-tc="id" - data-tc-id={maybe(() => productType.id)} + data-test="id" + data-test-id={maybe(() => productType.id)} > = props => { {productType ? ( <> - {productType.name} + {productType.name} {maybe(() => productType.hasVariants) ? intl.formatMessage({ diff --git a/src/products/components/ProductAttributes/ProductAttributes.tsx b/src/products/components/ProductAttributes/ProductAttributes.tsx index 8a91181a0..c6018c2ef 100644 --- a/src/products/components/ProductAttributes/ProductAttributes.tsx +++ b/src/products/components/ProductAttributes/ProductAttributes.tsx @@ -157,7 +157,7 @@ const ProductAttributes: React.FC = ({ = ({
{attribute.label}
-
+
{attribute.data.inputType === AttributeInputTypeEnum.DROPDOWN ? ( = props => { disabled={loading} variant="text" color="primary" - data-tc="button-upload-image" + data-test="button-upload-image" > {intl.formatMessage(commonMessages.uploadImage)} diff --git a/src/products/components/ProductList/ProductList.tsx b/src/products/components/ProductList/ProductList.tsx index a3649c39a..db60cc5f0 100644 --- a/src/products/components/ProductList/ProductList.tsx +++ b/src/products/components/ProductList/ProductList.tsx @@ -332,8 +332,8 @@ export const ProductList: React.FC = props => { key={product ? product.id : "skeleton"} onClick={product && onRowClick(product.id)} className={classes.link} - data-tc="id" - data-tc-id={maybe(() => product.id)} + data-test="id" + data-test-id={maybe(() => product.id)} > = props => { product.thumbnail.url)} - data-tc="name" + data-test="name" > {product?.productType ? (
@@ -377,7 +377,7 @@ export const ProductList: React.FC = props => { > {product && product.productType ? ( product.productType.name @@ -392,8 +392,8 @@ export const ProductList: React.FC = props => { > product.isPublished)} + data-test="isPublished" + data-test-is-published={maybe(() => product.isPublished)} > {product && maybe(() => product.isPublished !== undefined) ? ( @@ -420,8 +420,8 @@ export const ProductList: React.FC = props => { diff --git a/src/products/components/ProductListPage/ProductListPage.tsx b/src/products/components/ProductListPage/ProductListPage.tsx index b762f388b..37a2fa8d9 100644 --- a/src/products/components/ProductListPage/ProductListPage.tsx +++ b/src/products/components/ProductListPage/ProductListPage.tsx @@ -138,7 +138,7 @@ export const ProductListPage: React.FC = props => { onClick={onAdd} color="primary" variant="contained" - data-tc="add-product" + data-test="add-product" > = props => { value={data.productType} onChange={onProductTypeChange} fetchChoices={fetchProductTypes} - data-tc="product-type" + data-test="product-type" {...fetchMoreProductTypes} /> ) : ( @@ -170,7 +170,7 @@ const ProductOrganization: React.FC = props => { value={data.category} onChange={onCategoryChange} fetchChoices={fetchCategories} - data-tc="category" + data-test="category" {...fetchMoreCategories} /> @@ -195,7 +195,7 @@ const ProductOrganization: React.FC = props => { } onChange={onCollectionChange} fetchChoices={fetchCollections} - data-tc="collections" + data-test="collections" {...fetchMoreCollections} /> diff --git a/src/products/components/ProductVariantAttributes/ProductVariantAttributes.tsx b/src/products/components/ProductVariantAttributes/ProductVariantAttributes.tsx index 42d380748..02c561c82 100644 --- a/src/products/components/ProductVariantAttributes/ProductVariantAttributes.tsx +++ b/src/products/components/ProductVariantAttributes/ProductVariantAttributes.tsx @@ -115,7 +115,7 @@ const ProductVariantAttributes: React.FC = ({ value={getAttributeValue(attribute.id, attributes)} choices={getAttributeValueChoices(attribute.id, attributes)} allowCustomValues - data-tc="variant-attribute-input" + data-test="variant-attribute-input" /> )) )} diff --git a/src/products/components/ProductVariants/ProductVariants.tsx b/src/products/components/ProductVariants/ProductVariants.tsx index 2370235dd..97fe9748b 100644 --- a/src/products/components/ProductVariants/ProductVariants.tsx +++ b/src/products/components/ProductVariants/ProductVariants.tsx @@ -211,7 +211,7 @@ export const ProductVariants: React.FC = props => { onClick={onVariantAdd} variant="text" color="primary" - data-tc="button-add-variant" + data-test="button-add-variant" > = props => { onClick={onVariantsAdd} variant="text" color="primary" - data-tc="button-add-variants" + data-test="button-add-variants" > = props => { onChange={() => toggle(variant.id)} /> - + {variant ? variant.name || variant.sku : } - + {variant ? variant.sku : } - + {variant ? ( variant.price ? ( @@ -341,7 +341,7 @@ export const ProductVariants: React.FC = props => { {numAvailable === null ? ( diff --git a/src/services/components/ServiceList/ServiceList.tsx b/src/services/components/ServiceList/ServiceList.tsx index ce6d0ae37..ea0e01675 100644 --- a/src/services/components/ServiceList/ServiceList.tsx +++ b/src/services/components/ServiceList/ServiceList.tsx @@ -125,10 +125,10 @@ const ServiceList: React.FC = props => { onClick={service ? onRowClick(service.id) : undefined} > - + {maybe(() => service.name, )} - + {maybe(() => service.isActive ? (