fix shipping method (#2014)

* fix shipping method

* shippings fixed

* fix jest

cypress/elements/shared/unsavedChangesDialog.js

@@ -0,0 +1,4 @@
+export const UNSAVED_CHANGES_DIALOG = {
+  leaveWithoutSavingButton: '[data-test-id="leave-without-saving"]',
+  saveAndContinueButton: '[data-test-id="save-and-continue"]'
+};

cypress/elements/shipping/shipping-zone-details.js

@@ -11,7 +11,7 @@ export const SHIPPING_ZONE_DETAILS = {
   autocompleteContentDialog:
     "[data-test-id='multi-autocomplete-select-content']",
   option: "[data-test-id='multi-autocomplete-select-option']",
-  warehouseSelector: "[placeholder*='Warehouse']",
-  channelSelector: "[placeholder*='Channel']",
+  warehouseSelector: "[testId='warehouses']",
+  channelSelector: "[testId='channels']",
   removeWarehouseButton: "[data-test-id='warehouses-remove']"
 };

cypress/support/pages/shippingMethodPage.js

@@ -1,5 +1,6 @@
 import { BUTTON_SELECTORS } from "../../elements/shared/button-selectors";
 import { SHARED_ELEMENTS } from "../../elements/shared/sharedElements";
+import { UNSAVED_CHANGES_DIALOG } from "../../elements/shared/unsavedChangesDialog";
 import { SHIPPING_RATE_DETAILS } from "../../elements/shipping/shipping-rate-details";
 import { SHIPPING_ZONE_DETAILS } from "../../elements/shipping/shipping-zone-details";
 import { SHIPPING_ZONES_LIST } from "../../elements/shipping/shipping-zones-list";
@@ -31,12 +32,26 @@ export function fillUpShippingZoneData({
     .clearAndType(shippingName)
     .get(BUTTON_SELECTORS.confirm)
     .click()
-    .confirmationMessageShouldDisappear()
+    .confirmationMessageShouldAppear()
+
+    .get(SHIPPING_ZONE_DETAILS.warehouseSelector)
+    .click()
+    .get(SHIPPING_ZONE_DETAILS.warehouseSelector)
+    .type(warehouseName)
+    .get(SHIPPING_ZONE_DETAILS.autocompleteContentDialog);
+  cy.contains(SHIPPING_ZONE_DETAILS.option, warehouseName)
+    .click({ force: true })
+    .get(SHIPPING_ZONE_DETAILS.channelSelector)
+    .click()
+    .get(SHIPPING_ZONE_DETAILS.option)
+    .contains(channelName)
+    .click()
     .get(SHIPPING_ZONE_DETAILS.assignCountryButton)
     .click()
     .get(SHIPPING_ZONE_DETAILS.searchInput)
     .type(country);
-  cy.contains(SHIPPING_ZONE_DETAILS.tableRow, country)
+  return cy
+    .contains(SHIPPING_ZONE_DETAILS.tableRow, country)
     .find(BUTTON_SELECTORS.checkbox)
     .click()
     .get(SHIPPING_ZONE_DETAILS.submitAssignCountry)
@@ -44,25 +59,8 @@ export function fillUpShippingZoneData({
     .get(BUTTON_SELECTORS.confirm)
     .click()
     .confirmationMessageShouldDisappear()
-    .get(SHIPPING_ZONE_DETAILS.warehouseSelector)
-    .click()
-    .get(SHIPPING_ZONE_DETAILS.warehouseSelector)
-    .type(warehouseName)
-    .get(SHIPPING_ZONE_DETAILS.autocompleteContentDialog)
-    .scrollTo("bottom");
-  return cy
-    .contains(SHIPPING_ZONE_DETAILS.option, warehouseName)
-    .click({ force: true })
-    .get(SHIPPING_ZONE_DETAILS.channelSelector)
-    .click()
-    .get(SHIPPING_ZONE_DETAILS.option)
-    .contains(channelName)
-    .click()
     .addAliasToGraphRequest("UpdateShippingZone")
-    .get(BUTTON_SELECTORS.confirm)
-    .click()
-    .confirmationMessageShouldDisappear()
-    .waitForRequestAndCheckIfNoErrors("@UpdateShippingZone");
+    .reload();
 }
 
 export function changeWeightUnit(weightUnit) {
@@ -70,7 +68,7 @@ export function changeWeightUnit(weightUnit) {
     .addAliasToGraphRequest("UpdateDefaultWeightUnit")
     .get(SHIPPING_ZONES_LIST.saveUnit)
     .click()
-    .confirmationMessageShouldDisappear()
+    .confirmationMessageShouldAppear()
     .waitForRequestAndCheckIfNoErrors("@UpdateDefaultWeightUnit")
     .wait(5000);
 }
@@ -166,10 +164,10 @@ export function saveRate() {
     .addAliasToGraphRequest("ShippingZone")
     .get(BUTTON_SELECTORS.confirm)
     .click()
-    .confirmationMessageShouldDisappear()
+    .confirmationMessageShouldAppear()
     .waitForRequestAndCheckIfNoErrors(`@ShippingMethodChannelListingUpdate`)
     .waitForRequestAndCheckIfNoErrors(`@ShippingZone`)
-    .its("response.body.0.data.shippingZone");
+    .its("response.body.data.shippingZone");
 }
 
 export function saveRateAfterUpdate() {
@@ -177,7 +175,7 @@ export function saveRateAfterUpdate() {
     .addAliasToGraphRequest("ShippingMethodChannelListingUpdate")
     .get(BUTTON_SELECTORS.confirm)
     .click()
-    .confirmationMessageShouldDisappear()
+    .confirmationMessageShouldAppear()
     .waitForRequestAndCheckIfNoErrors(`@ShippingMethodChannelListingUpdate`);
 }
 

package.json

@@ -274,7 +274,7 @@
     "cy:run:refactored:locally": "cypress run --env tags=refactored --spec 'cypress/integration/navigation.js','cypress/integration/products/createProduct.js', 'cypress/integration/products/productsVariants.js', --reporter cypress-mochawesome-reporter --reporter-options reportDir='cypress/reports',overwrite=true,charts=true",
     "cy:run:critical": "cypress run --record --env tags=critical --spec 'cypress/integration/navigation.js','cypress/integration/products/createProduct.js', 'cypress/integration/products/productsVariants.js'",
     "cy:run:allEnv": "cypress run --record --env tags=all",
-    "cy:run:allEnv:parallel": "cypress run --record --env tags=all --parallel", 
+    "cy:run:allEnv:parallel": "cypress run --record --env tags=all --parallel",
     "test:e2e:run": "start-server-and-test start http://localhost:9000 cy:run",
     "test:e2e:run:record": "start-server-and-test start http://localhost:9000 cy:run:record",
     "test:e2e:dev": "start-server-and-test start http://localhost:9000 cy:open",

src/components/Form/ExitFormDialog.tsx

@@ -56,7 +56,7 @@ const ExitFormDialog: React.FC<ExitFormDialogProps> = ({
       />
       <DialogContent className={classes.dialogContent}>
         <div className={classes.buttonsContainer}>
-          <Button onClick={onLeave}>
+          <Button onClick={onLeave} data-test-id="leave-without-saving">
             {intl.formatMessage(messages.cancelButton)}
           </Button>
           <HorizontalSpacer />

src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectField.tsx

@@ -217,6 +217,7 @@ const MultiAutocompleteSelectFieldComponent: React.FC<MultiAutocompleteSelectFie
                     inputProps={{
                       ...getInputProps({
                         placeholder,
+                        testId,
                         onClick: toggleMenu
                       }),
                       ...getMenuProps()

src/shipping/components/ShippingZoneSettingsCard/ChannelsSection.tsx

@@ -58,6 +58,7 @@ const ChannelsSection: React.FC<ChannelsSectionProps> = ({
         onChange={onChange}
         placeholder={intl.formatMessage(messages.selectFieldPlaceholder)}
         value={selectedChannels}
+        testId="channels"
       />
     </>
   );

src/storybook/__snapshots__/Stories.test.ts.snap

@@ -24100,6 +24100,7 @@ exports[`Storyshots Shipping zones details / Settings Card default 1`] = `
                 id="downshift-42-menu"
                 placeholder="Add Channel"
                 role="listbox"
+                testid="channels"
                 type="text"
                 value=""
               />
@@ -24158,7 +24159,7 @@ exports[`Storyshots Shipping zones details / Settings Card default 1`] = `
               </div>
               <button
                 class="MuiButtonBase-root-id IconButton-secondary-id MultiAutocompleteSelectField-chipClose-id"
-                data-test-id="remove"
+                data-test-id="channels-remove"
                 tabindex="0"
                 type="button"
               >
@@ -24215,6 +24216,7 @@ exports[`Storyshots Shipping zones details / Settings Card default 1`] = `
                 id="downshift-43-menu"
                 placeholder="Select Warehouse"
                 role="listbox"
+                testid="warehouses"
                 type="text"
                 value=""
               />
@@ -43540,7 +43542,7 @@ exports[`Storyshots Views / Categories / Update category no products 1`] = `
             >
               <a
                 class="InternalLink-root-id"
-                href="/products/?categories%5B0%5D=Q2F0ZWdvcnk6NA%3D%3D"
+                href="/dashboard/products/?categories%5B0%5D=Q2F0ZWdvcnk6NA%3D%3D"
               >
                 <button
                   class="MuiButtonBase-root-id MuiButton-root-id MuiButton-outlined-id MuiButton-outlinedPrimary-id MuiButton-outlinedSizeSmall-id MuiButton-sizeSmall-id"
@@ -45074,7 +45076,7 @@ exports[`Storyshots Views / Categories / Update category products 1`] = `
             >
               <a
                 class="InternalLink-root-id"
-                href="/products/?categories%5B0%5D=Q2F0ZWdvcnk6NA%3D%3D"
+                href="/dashboard/products/?categories%5B0%5D=Q2F0ZWdvcnk6NA%3D%3D"
               >
                 <button
                   class="MuiButtonBase-root-id MuiButton-root-id MuiButton-outlined-id MuiButton-outlinedPrimary-id MuiButton-outlinedSizeSmall-id MuiButton-sizeSmall-id"
@@ -62997,7 +62999,7 @@ exports[`Storyshots Views / Configuration default 1`] = `
       >
         <a
           class="ConfigurationPage-link-id"
-          href="/attributes/"
+          href="/dashboard/attributes/"
         >
           <div
             class="MuiPaper-root-id MuiCard-root-id NavigationCard-card-id MuiPaper-elevation0-id MuiPaper-rounded-id"
@@ -63044,7 +63046,7 @@ exports[`Storyshots Views / Configuration default 1`] = `
         </a>
         <a
           class="ConfigurationPage-link-id"
-          href="/product-types/"
+          href="/dashboard/product-types/"
         >
           <div
             class="MuiPaper-root-id MuiCard-root-id NavigationCard-card-id MuiPaper-elevation0-id MuiPaper-rounded-id"
@@ -63108,7 +63110,7 @@ exports[`Storyshots Views / Configuration default 1`] = `
       >
         <a
           class="ConfigurationPage-link-id"
-          href="/taxes/"
+          href="/dashboard/taxes/"
         >
           <div
             class="MuiPaper-root-id MuiCard-root-id NavigationCard-card-id MuiPaper-elevation0-id MuiPaper-rounded-id"
@@ -63172,7 +63174,7 @@ exports[`Storyshots Views / Configuration default 1`] = `
       >
         <a
           class="ConfigurationPage-link-id"
-          href="/staff/"
+          href="/dashboard/staff/"
         >
           <div
             class="MuiPaper-root-id MuiCard-root-id NavigationCard-card-id MuiPaper-elevation0-id MuiPaper-rounded-id"
@@ -63219,7 +63221,7 @@ exports[`Storyshots Views / Configuration default 1`] = `
         </a>
         <a
           class="ConfigurationPage-link-id"
-          href="/permission-groups/"
+          href="/dashboard/permission-groups/"
         >
           <div
             class="MuiPaper-root-id MuiCard-root-id NavigationCard-card-id MuiPaper-elevation0-id MuiPaper-rounded-id"
@@ -63283,7 +63285,7 @@ exports[`Storyshots Views / Configuration default 1`] = `
       >
         <a
           class="ConfigurationPage-link-id"
-          href="/shipping/"
+          href="/dashboard/shipping/"
         >
           <div
             class="MuiPaper-root-id MuiCard-root-id NavigationCard-card-id MuiPaper-elevation0-id MuiPaper-rounded-id"
@@ -63330,7 +63332,7 @@ exports[`Storyshots Views / Configuration default 1`] = `
         </a>
         <a
           class="ConfigurationPage-link-id"
-          href="/warehouses/"
+          href="/dashboard/warehouses/"
         >
           <div
             class="MuiPaper-root-id MuiCard-root-id NavigationCard-card-id MuiPaper-elevation0-id MuiPaper-rounded-id"
@@ -63394,7 +63396,7 @@ exports[`Storyshots Views / Configuration default 1`] = `
       >
         <a
           class="ConfigurationPage-link-id"
-          href="/page-types/"
+          href="/dashboard/page-types/"
         >
           <div
             class="MuiPaper-root-id MuiCard-root-id NavigationCard-card-id MuiPaper-elevation0-id MuiPaper-rounded-id"
@@ -63458,7 +63460,7 @@ exports[`Storyshots Views / Configuration default 1`] = `
       >
         <a
           class="ConfigurationPage-link-id"
-          href="/navigation"
+          href="/dashboard/navigation"
         >
           <div
             class="MuiPaper-root-id MuiCard-root-id NavigationCard-card-id MuiPaper-elevation0-id MuiPaper-rounded-id"
@@ -63505,7 +63507,7 @@ exports[`Storyshots Views / Configuration default 1`] = `
         </a>
         <a
           class="ConfigurationPage-link-id"
-          href="/site-settings"
+          href="/dashboard/site-settings"
         >
           <div
             class="MuiPaper-root-id MuiCard-root-id NavigationCard-card-id MuiPaper-elevation0-id MuiPaper-rounded-id"
@@ -63558,7 +63560,7 @@ exports[`Storyshots Views / Configuration default 1`] = `
         </a>
         <a
           class="ConfigurationPage-link-id"
-          href="/plugins/"
+          href="/dashboard/plugins/"
         >
           <div
             class="MuiPaper-root-id MuiCard-root-id NavigationCard-card-id MuiPaper-elevation0-id MuiPaper-rounded-id"
@@ -63671,7 +63673,7 @@ exports[`Storyshots Views / Configuration partial access 1`] = `
       >
         <a
           class="ConfigurationPage-link-id"
-          href="/attributes/"
+          href="/dashboard/attributes/"
         >
           <div
             class="MuiPaper-root-id MuiCard-root-id NavigationCard-card-id MuiPaper-elevation0-id MuiPaper-rounded-id"
@@ -63718,7 +63720,7 @@ exports[`Storyshots Views / Configuration partial access 1`] = `
         </a>
         <a
           class="ConfigurationPage-link-id"
-          href="/product-types/"
+          href="/dashboard/product-types/"
         >
           <div
             class="MuiPaper-root-id MuiCard-root-id NavigationCard-card-id MuiPaper-elevation0-id MuiPaper-rounded-id"
@@ -63782,7 +63784,7 @@ exports[`Storyshots Views / Configuration partial access 1`] = `
       >
         <a
           class="ConfigurationPage-link-id"
-          href="/warehouses/"
+          href="/dashboard/warehouses/"
         >
           <div
             class="MuiPaper-root-id MuiCard-root-id NavigationCard-card-id MuiPaper-elevation0-id MuiPaper-rounded-id"
@@ -63846,7 +63848,7 @@ exports[`Storyshots Views / Configuration partial access 1`] = `
       >
         <a
           class="ConfigurationPage-link-id"
-          href="/page-types/"
+          href="/dashboard/page-types/"
         >
           <div
             class="MuiPaper-root-id MuiCard-root-id NavigationCard-card-id MuiPaper-elevation0-id MuiPaper-rounded-id"
@@ -179324,6 +179326,7 @@ exports[`Storyshots Views / Products / Create product When loading 1`] = `
                       class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                       id="downshift-81-menu"
                       role="listbox"
+                      testid="collection"
                       type="text"
                       value=""
                     />
@@ -180091,6 +180094,7 @@ exports[`Storyshots Views / Products / Create product default 1`] = `
                       class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                       id="downshift-78-menu"
                       role="listbox"
+                      testid="collection"
                       type="text"
                       value=""
                     />
@@ -181015,6 +181019,7 @@ exports[`Storyshots Views / Products / Create product form errors 1`] = `
                       class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                       id="downshift-85-menu"
                       role="listbox"
+                      testid="collection"
                       type="text"
                       value=""
                     />
@@ -187502,7 +187507,7 @@ exports[`Storyshots Views / Products / Product edit form errors 1`] = `
               >
                 <a
                   class="Link-root-id Link-primary-id Link-noUnderline-id"
-                  href="/product-types/pt76406"
+                  href="/dashboard/product-types/pt76406"
                 >
                   Versatile
                 </a>
@@ -187640,6 +187645,7 @@ exports[`Storyshots Views / Products / Product edit form errors 1`] = `
                       class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                       id="downshift-124-menu"
                       role="listbox"
+                      testid="collection"
                       type="text"
                       value=""
                     />
@@ -189354,7 +189360,7 @@ exports[`Storyshots Views / Products / Product edit limits reached 1`] = `
               >
                 <a
                   class="Link-root-id Link-primary-id Link-noUnderline-id"
-                  href="/product-types/pt76406"
+                  href="/dashboard/product-types/pt76406"
                 >
                   Versatile
                 </a>
@@ -189487,6 +189493,7 @@ exports[`Storyshots Views / Products / Product edit limits reached 1`] = `
                       class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                       id="downshift-139-menu"
                       role="listbox"
+                      testid="collection"
                       type="text"
                       value=""
                     />
@@ -191121,7 +191128,7 @@ exports[`Storyshots Views / Products / Product edit no limits 1`] = `
               >
                 <a
                   class="Link-root-id Link-primary-id Link-noUnderline-id"
-                  href="/product-types/pt76406"
+                  href="/dashboard/product-types/pt76406"
                 >
                   Versatile
                 </a>
@@ -191254,6 +191261,7 @@ exports[`Storyshots Views / Products / Product edit no limits 1`] = `
                       class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                       id="downshift-134-menu"
                       role="listbox"
+                      testid="collection"
                       type="text"
                       value=""
                     />
@@ -192622,7 +192630,7 @@ exports[`Storyshots Views / Products / Product edit no product attributes 1`] =
               >
                 <a
                   class="Link-root-id Link-primary-id Link-noUnderline-id"
-                  href="/product-types/pt76406"
+                  href="/dashboard/product-types/pt76406"
                 >
                   Versatile
                 </a>
@@ -192755,6 +192763,7 @@ exports[`Storyshots Views / Products / Product edit no product attributes 1`] =
                       class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                       id="downshift-119-menu"
                       role="listbox"
+                      testid="collection"
                       type="text"
                       value=""
                     />
@@ -194287,7 +194296,7 @@ exports[`Storyshots Views / Products / Product edit no stock and no variants 1`]
               >
                 <a
                   class="Link-root-id Link-primary-id Link-noUnderline-id"
-                  href="/product-types/pt76406"
+                  href="/dashboard/product-types/pt76406"
                 >
                   Versatile
                 </a>
@@ -194420,6 +194429,7 @@ exports[`Storyshots Views / Products / Product edit no stock and no variants 1`]
                       class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                       id="downshift-111-menu"
                       role="listbox"
+                      testid="collection"
                       type="text"
                       value=""
                     />
@@ -195952,7 +195962,7 @@ exports[`Storyshots Views / Products / Product edit no stock, no variants and no
               >
                 <a
                   class="Link-root-id Link-primary-id Link-noUnderline-id"
-                  href="/product-types/pt76406"
+                  href="/dashboard/product-types/pt76406"
                 >
                   Versatile
                 </a>
@@ -196085,6 +196095,7 @@ exports[`Storyshots Views / Products / Product edit no stock, no variants and no
                       class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                       id="downshift-116-menu"
                       role="listbox"
+                      testid="collection"
                       type="text"
                       value=""
                     />
@@ -197617,7 +197628,7 @@ exports[`Storyshots Views / Products / Product edit no variants 1`] = `
               >
                 <a
                   class="Link-root-id Link-primary-id Link-noUnderline-id"
-                  href="/product-types/pt76406"
+                  href="/dashboard/product-types/pt76406"
                 >
                   Versatile
                 </a>
@@ -197750,6 +197761,7 @@ exports[`Storyshots Views / Products / Product edit no variants 1`] = `
                       class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                       id="downshift-106-menu"
                       role="listbox"
+                      testid="collection"
                       type="text"
                       value=""
                     />
@@ -199384,7 +199396,7 @@ exports[`Storyshots Views / Products / Product edit when data is fully loaded 1`
               >
                 <a
                   class="Link-root-id Link-primary-id Link-noUnderline-id"
-                  href="/product-types/pt76406"
+                  href="/dashboard/product-types/pt76406"
                 >
                   Versatile
                 </a>
@@ -199517,6 +199529,7 @@ exports[`Storyshots Views / Products / Product edit when data is fully loaded 1`
                       class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                       id="downshift-89-menu"
                       role="listbox"
+                      testid="collection"
                       type="text"
                       value=""
                     />
@@ -200756,6 +200769,7 @@ exports[`Storyshots Views / Products / Product edit when loading data 1`] = `
                       class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                       id="downshift-102-menu"
                       role="listbox"
+                      testid="collection"
                       type="text"
                       value=""
                     />
@@ -202201,7 +202215,7 @@ exports[`Storyshots Views / Products / Product edit when product has no images 1
               >
                 <a
                   class="Link-root-id Link-primary-id Link-noUnderline-id"
-                  href="/product-types/pt76406"
+                  href="/dashboard/product-types/pt76406"
                 >
                   Versatile
                 </a>
@@ -202334,6 +202348,7 @@ exports[`Storyshots Views / Products / Product edit when product has no images 1
                       class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                       id="downshift-94-menu"
                       role="listbox"
+                      testid="collection"
                       type="text"
                       value=""
                     />
@@ -203866,7 +203881,7 @@ exports[`Storyshots Views / Products / Product edit when product has no variants
               >
                 <a
                   class="Link-root-id Link-primary-id Link-noUnderline-id"
-                  href="/product-types/pt76406"
+                  href="/dashboard/product-types/pt76406"
                 >
                   Versatile
                 </a>
@@ -203999,6 +204014,7 @@ exports[`Storyshots Views / Products / Product edit when product has no variants
                       class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                       id="downshift-99-menu"
                       role="listbox"
+                      testid="collection"
                       type="text"
                       value=""
                     />
@@ -205633,7 +205649,7 @@ exports[`Storyshots Views / Products / Product edit with channels 1`] = `
               >
                 <a
                   class="Link-root-id Link-primary-id Link-noUnderline-id"
-                  href="/product-types/pt76406"
+                  href="/dashboard/product-types/pt76406"
                 >
                   Versatile
                 </a>
@@ -205766,6 +205782,7 @@ exports[`Storyshots Views / Products / Product edit with channels 1`] = `
                       class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                       id="downshift-129-menu"
                       role="listbox"
+                      testid="collection"
                       type="text"
                       value=""
                     />
@@ -234215,6 +234232,7 @@ exports[`Storyshots Views / Shipping / Shipping zone details default 1`] = `
                       id="downshift-158-menu"
                       placeholder="Add Channel"
                       role="listbox"
+                      testid="channels"
                       type="text"
                       value=""
                     />
@@ -234273,7 +234291,7 @@ exports[`Storyshots Views / Shipping / Shipping zone details default 1`] = `
                     </div>
                     <button
                       class="MuiButtonBase-root-id IconButton-secondary-id MultiAutocompleteSelectField-chipClose-id"
-                      data-test-id="remove"
+                      data-test-id="channels-remove"
                       tabindex="0"
                       type="button"
                     >
@@ -234303,7 +234321,7 @@ exports[`Storyshots Views / Shipping / Shipping zone details default 1`] = `
                     </div>
                     <button
                       class="MuiButtonBase-root-id IconButton-secondary-id MultiAutocompleteSelectField-chipClose-id"
-                      data-test-id="remove"
+                      data-test-id="channels-remove"
                       tabindex="0"
                       type="button"
                     >
@@ -234360,6 +234378,7 @@ exports[`Storyshots Views / Shipping / Shipping zone details default 1`] = `
                       id="downshift-159-menu"
                       placeholder="Select Warehouse"
                       role="listbox"
+                      testid="warehouses"
                       type="text"
                       value=""
                     />
@@ -235342,6 +235361,7 @@ exports[`Storyshots Views / Shipping / Shipping zone details form errors 1`] = `
                       id="downshift-162-menu"
                       placeholder="Add Channel"
                       role="listbox"
+                      testid="channels"
                       type="text"
                       value=""
                     />
@@ -235400,7 +235420,7 @@ exports[`Storyshots Views / Shipping / Shipping zone details form errors 1`] = `
                     </div>
                     <button
                       class="MuiButtonBase-root-id IconButton-secondary-id MultiAutocompleteSelectField-chipClose-id"
-                      data-test-id="remove"
+                      data-test-id="channels-remove"
                       tabindex="0"
                       type="button"
                     >
@@ -235430,7 +235450,7 @@ exports[`Storyshots Views / Shipping / Shipping zone details form errors 1`] = `
                     </div>
                     <button
                       class="MuiButtonBase-root-id IconButton-secondary-id MultiAutocompleteSelectField-chipClose-id"
-                      data-test-id="remove"
+                      data-test-id="channels-remove"
                       tabindex="0"
                       type="button"
                     >
@@ -235487,6 +235507,7 @@ exports[`Storyshots Views / Shipping / Shipping zone details form errors 1`] = `
                       id="downshift-163-menu"
                       placeholder="Select Warehouse"
                       role="listbox"
+                      testid="warehouses"
                       type="text"
                       value=""
                     />
@@ -236335,6 +236356,7 @@ exports[`Storyshots Views / Shipping / Shipping zone details loading 1`] = `
                       id="downshift-160-menu"
                       placeholder="Add Channel"
                       role="listbox"
+                      testid="channels"
                       type="text"
                       value=""
                     />
@@ -236419,6 +236441,7 @@ exports[`Storyshots Views / Shipping / Shipping zone details loading 1`] = `
                       id="downshift-161-menu"
                       placeholder="Select Warehouse"
                       role="listbox"
+                      testid="warehouses"
                       type="text"
                       value=""
                     />