Merge branch 'master' into remix-bff-setup

concrete-utopia · Feb 2, 2024 · 37426c7 · 37426c7
2 parents 042acfb + 1fcfbd8
commit 37426c7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/...c/components/canvas/canvas-strategies/strategies/absolute-move-strategy.spec.browser2.tsx b/...c/components/canvas/canvas-strategies/strategies/absolute-move-strategy.spec.browser2.tsx
@@ -633,9 +633,7 @@ describe('Absolute Move Strategy', () => {
       const toolbarEditButtonImage = renderResult.renderedDOM.getByTestId(
         `${CanvasToolbarEditButtonID}-icon`,
       )
-      expect(toolbarEditButtonImage.getAttribute('src')).toEqual(
-        'http://localhost:9876/editor/icons/light/modalities/[email protected]',
-      )
+      expect(toolbarEditButtonImage.getAttribute('src')).toEqual(expect.stringContaining('moveabs')) // the toolbar shows the Absolute Move icon
     })
 
     await renderResult.getDispatchFollowUpActionsFinished()

diff --git a/...rc/components/canvas/canvas-strategies/strategies/flex-reorder-strategy.spec.browser2.tsx b/...rc/components/canvas/canvas-strategies/strategies/flex-reorder-strategy.spec.browser2.tsx
@@ -252,7 +252,7 @@ describe('Flex Reorder Strategy', () => {
               `${CanvasToolbarEditButtonID}-icon`,
             )
             expect(toolbarEditButtonImage.getAttribute('src')).toEqual(
-              'http://localhost:9876/editor/icons/light/modalities/reorder[email protected]',
+              expect.stringContaining('reorder'), // check if the toolbar shows the Reorder icon
             )
             expect(renderResult.getEditorState().strategyState.currentStrategy).toEqual(
               'FLEX_REORDER',