@robotical/martyblocksjr 4.2.1 → 4.2.3

package/tests/e2e/accessibility.e2e.test.js

@@ -138,9 +138,11 @@ async function getFocusStyles(page, selector) {
 }
 
 function expectVisibleFocusIndicator(focusStyles) {
-    expect(focusStyles.outlineStyle).not.toBe('none');
-    expect(focusStyles.outlineWidth).toBeGreaterThan(0);
-    expect(focusStyles.outlineColor).not.toBe('rgba(0, 0, 0, 0)');
+    const hasVisibleOutline = focusStyles.outlineStyle !== 'none' &&
+        focusStyles.outlineWidth > 0 &&
+        focusStyles.outlineColor !== 'rgba(0, 0, 0, 0)';
+    const hasVisibleBoxShadow = focusStyles.boxShadow && focusStyles.boxShadow !== 'none';
+    expect(hasVisibleOutline || hasVisibleBoxShadow).toBe(true);
 }
 
 async function expectNamedControls(page, selectors) {
@@ -231,7 +233,7 @@ describe('Accessibility shell audit', () => {
             await new Promise((resolve) => setTimeout(resolve, 1200));
             await page.click('#booktab');
             await page.waitForSelector('iframe#htmlcontents', { timeout: 30_000 });
-            expect(await page.$eval('iframe#htmlcontents', (element) => element.getAttribute('title'))).toBe('About ScratchJr');
+            expect(await page.$eval('iframe#htmlcontents', (element) => element.getAttribute('title'))).toBe('About Blocks Jr');
 
             expectNoAxeViolations(await runAxe(page));
             expect(errors).toEqual([]);
@@ -250,11 +252,25 @@ describe('Accessibility shell audit', () => {
             });
 
             const guideCases = [
+                {
+                    path: 'inapp/about.html',
+                    title: 'About Blocks Jr',
+                    focusSelector: '#skip-link',
+                    buttonSelectors: [],
+                    decorativeImageSelector: '.about-hero-art img'
+                },
                 {
                     path: 'inapp/interface.html',
                     title: 'Interface Guide',
                     focusSelector: '#interface-button-save',
-                    buttonSelectors: ['#interface-button-save', '#interface-button-stage', '#interface-button-green-flag'],
+                    buttonSelectors: [
+                        '#interface-button-save',
+                        '#interface-button-extensions',
+                        '#interface-button-stage',
+                        '#interface-button-green-flag',
+                        '#interface-button-duplicate-page',
+                        '#interface-button-zoom'
+                    ],
                     decorativeImageSelector: '.ipad-project-view'
                 },
                 {
@@ -267,9 +283,13 @@ describe('Accessibility shell audit', () => {
                 {
                     path: 'inapp/blocks.html',
                     title: 'Blocks Guide',
-                    focusSelector: '#skip-link',
-                    buttonSelectors: [],
-                    decorativeImageSelector: '.block-image'
+                    focusSelector: '#blocks-guide-tab-marty',
+                    buttonSelectors: [
+                        '#blocks-guide-tab-marty',
+                        '#blocks-guide-tab-sprite',
+                        '#blocks-guide-tab-cog'
+                    ],
+                    decorativeImageSelector: '.block-guide-icon'
                 }
             ];
 
@@ -279,12 +299,14 @@ describe('Accessibility shell audit', () => {
                 await page.goto(`${HOST}/${guideCase.path}`, { waitUntil: 'domcontentloaded', timeout: 30_000 });
                 await waitForTitle(page, guideCase.title);
                 await page.waitForSelector('#skip-link');
-                await page.waitForSelector('#content[role="main"]');
+                await page.waitForSelector('#content');
 
                 expect((await page.title()).includes(guideCase.title)).toBe(true);
                 expect(await page.$eval('html', (element) => element.lang)).toBe('en');
                 expect(await page.$eval('#skip-link', (element) => element.getAttribute('href'))).toBe('#content');
-                expect(await page.$eval('#content', (element) => element.getAttribute('role'))).toBe('main');
+                expect(await page.$eval('#content', (element) => {
+                    return element.tagName.toLowerCase() === 'main' || element.getAttribute('role') === 'main';
+                })).toBe(true);
 
                 if (guideCase.buttonSelectors.length > 0) {
                     await expectNamedControls(page, guideCase.buttonSelectors);
@@ -298,6 +320,127 @@ describe('Accessibility shell audit', () => {
                 await tabToSelector(page, guideCase.focusSelector);
                 expectVisibleFocusIndicator(await getFocusStyles(page, guideCase.focusSelector));
 
+                if (guideCase.path === 'inapp/interface.html') {
+                    const buttonIds = await page.$$eval('.interface-button', (buttons) => {
+                        return buttons.map((button) => button.id);
+                    });
+                    expect(buttonIds).toHaveLength(24);
+                    expect(await page.$$eval('.interface-connector', (connectors) => connectors.length)).toBe(24);
+                    expect(await page.$eval('#interface-key-header', (element) => element.textContent)).toBe('1 | Save');
+
+                    for (let index = 0; index < buttonIds.length; index += 1) {
+                        const selector = `#${buttonIds[index]}`;
+                        await page.click(selector);
+                        const selectedFeature = await page.evaluate((buttonSelector) => {
+                            const button = document.querySelector(buttonSelector);
+                            const connector = document.querySelector(
+                                `.interface-connector[data-guide-key="${button.getAttribute('data-guide-key')}"]`
+                            );
+                            const number = button.querySelector('span');
+                            return {
+                                ariaCurrent: button.getAttribute('aria-current'),
+                                ariaLabel: button.getAttribute('aria-label'),
+                                buttonBackground: window.getComputedStyle(button).backgroundColor,
+                                connectorIsSelected: connector.classList.contains('interface-connector-selected'),
+                                connectorLineLength: connector.querySelector('line').getTotalLength(),
+                                description: document.querySelector('#interface-key-description').textContent,
+                                header: document.querySelector('#interface-key-header').textContent,
+                                numberColor: window.getComputedStyle(number).color,
+                                numberText: number.textContent,
+                                selectedConnectorCount: document.querySelectorAll(
+                                    '.interface-connector-selected'
+                                ).length,
+                                selectedCount: document.querySelectorAll('.interface-button[aria-current="page"]').length
+                            };
+                        }, selector);
+
+                        expect(selectedFeature.header).toBe(selectedFeature.ariaLabel);
+                        expect(selectedFeature.header.startsWith(`${index + 1} | `)).toBe(true);
+                        expect(selectedFeature.header).not.toContain('String missing:');
+                        expect(selectedFeature.description.trim().length).toBeGreaterThan(0);
+                        expect(selectedFeature.description).not.toContain('String missing:');
+                        expect(selectedFeature.ariaCurrent).toBe('page');
+                        expect(selectedFeature.numberText).toBe(String(index + 1));
+                        expect(selectedFeature.numberColor).not.toBe(selectedFeature.buttonBackground);
+                        expect(selectedFeature.connectorIsSelected).toBe(true);
+                        expect(selectedFeature.connectorLineLength).toBeGreaterThan(0);
+                        expect(selectedFeature.selectedConnectorCount).toBe(1);
+                        expect(selectedFeature.selectedCount).toBe(1);
+                    }
+
+                    await page.click('#interface-button-extensions');
+                    expect(await page.$eval('#interface-key-header', (element) => element.textContent)).toBe('3 | Extensions');
+                    expect(await page.$eval('#interface-key-description', (element) => element.textContent)).toContain('micro:bit');
+                }
+
+                if (guideCase.path === 'inapp/blocks.html') {
+                    const inventory = await page.evaluate(() => {
+                        const modeCounts = {};
+                        document.querySelectorAll('[data-guide-mode-panel]').forEach((panel) => {
+                            modeCounts[panel.getAttribute('data-guide-mode-panel')] =
+                                panel.querySelectorAll('.block-guide-card').length;
+                        });
+                        return {
+                            activeMode: document.querySelector('[role="tab"][aria-selected="true"]')
+                                .getAttribute('data-guide-mode'),
+                            extensionCount: document.querySelectorAll(
+                                '#blocks-guide-extension .block-guide-card'
+                            ).length,
+                            modeCounts,
+                            missingCopy: document.body.textContent.includes('String missing:'),
+                            tabCount: document.querySelectorAll('[role="tab"]').length
+                        };
+                    });
+                    expect(inventory).toEqual({
+                        activeMode: 'marty',
+                        extensionCount: 8,
+                        modeCounts: {
+                            marty: 44,
+                            sprite: 31,
+                            cog: 19
+                        },
+                        missingCopy: false,
+                        tabCount: 3
+                    });
+
+                    await page.click('#blocks-guide-tab-sprite');
+                    expect(await page.$eval('#blocks-guide-panel-sprite', (panel) => panel.hidden)).toBe(false);
+                    expect(await page.$eval('#blocks-guide-panel-marty', (panel) => panel.hidden)).toBe(true);
+
+                    await page.focus('#blocks-guide-tab-sprite');
+                    await page.keyboard.press('ArrowRight');
+                    expect(await page.$eval('#blocks-guide-tab-cog', (tab) => tab.getAttribute('aria-selected'))).toBe('true');
+                    expect(await page.$eval('#blocks-guide-panel-cog', (panel) => panel.hidden)).toBe(false);
+
+                    for (const modeId of ['marty', 'sprite', 'cog']) {
+                        await page.evaluate(() => {
+                            window.scrollTo(0, document.documentElement.scrollHeight);
+                        });
+                        await page.click(`#blocks-guide-tab-${modeId}`);
+                        const selectedMode = await page.evaluate((expectedMode) => {
+                            const tab = document.querySelector(`[data-guide-mode="${expectedMode}"]`);
+                            const panel = document.querySelector(`[data-guide-mode-panel="${expectedMode}"]`);
+                            const firstCard = panel.querySelector('.block-guide-card');
+                            const tabsShell = document.querySelector('.blocks-guide-tabs-shell');
+                            const cardRect = firstCard.getBoundingClientRect();
+                            const tabsRect = tabsShell.getBoundingClientRect();
+                            return {
+                                activeMode: document.querySelector('[role="tab"][aria-selected="true"]')
+                                    .getAttribute('data-guide-mode'),
+                                firstCardVisible: cardRect.top < window.innerHeight && cardRect.bottom > tabsRect.bottom,
+                                panelHidden: panel.hidden,
+                                tabSelected: tab.getAttribute('aria-selected')
+                            };
+                        }, modeId);
+                        expect(selectedMode).toEqual({
+                            activeMode: modeId,
+                            firstCardVisible: true,
+                            panelHidden: false,
+                            tabSelected: 'true'
+                        });
+                    }
+                }
+
                 await activateSkipLink(page, 'content');
 
                 expectNoAxeViolations(await runAxe(page));
@@ -378,6 +521,7 @@ describe('Accessibility shell audit', () => {
                 const motionButton = document.getElementById('sprite-motion');
                 return motionButton && motionButton.getAttribute('aria-pressed') === 'true';
             }, { timeout: 5_000 });
+            expect((await getFocusStyles(page, '#sprite-motion')).outlineStyle).toBe('none');
             await page.waitForSelector('#forward_block[role="button"]', { timeout: 30_000 });
 
             await expectNamedControls(page, ['#forward_block', '#back_block']);

package/tests/e2e/animated-sprite-paint-disabled.e2e.test.js

@@ -72,7 +72,94 @@ async function openEditor() {
   return { browser, page, errors };
 }
 
-describe("animated sprite paint editing", () => {
+async function dragBlockToScripts(page, categorySelector, blockSelector, blockType) {
+  const blockCount = await page.evaluate(() => window.ScratchJr.getBlocks().length);
+  await page.click(categorySelector);
+  await page.waitForSelector(blockSelector, { visible: true });
+
+  const source = await page.$eval(blockSelector, (node) => {
+    const rect = node.getBoundingClientRect();
+    return {
+      x: rect.left + rect.width / 2,
+      y: rect.top + rect.height / 2,
+    };
+  });
+  const target = await page.$eval("#scripts", (node) => {
+    const rect = node.getBoundingClientRect();
+    return {
+      x: rect.left + Math.min(220, rect.width / 2),
+      y: rect.top + Math.min(170, rect.height / 2),
+    };
+  });
+
+  await page.mouse.move(source.x, source.y);
+  await page.mouse.down();
+  await page.mouse.move(target.x, target.y, { steps: 12 });
+  await page.mouse.up();
+
+  await page.waitForFunction(
+    (before, type) => window.ScratchJr.getBlocks().length > before
+      && window.ScratchJr.getBlocks().some((block) => block.blocktype === type),
+    { timeout: 30_000 },
+    blockCount,
+    blockType
+  );
+}
+
+async function getSelectedSpritePaintState(page) {
+  return page.evaluate(() => {
+    const sprite = window.ScratchJr && window.ScratchJr.getSprite();
+    const thumb = sprite && sprite.thumbnail;
+    const brush = thumb && thumb.querySelector(".brush");
+    if (!sprite || !thumb || !brush) {
+      throw new Error("Selected sprite paint controls were not found");
+    }
+    return {
+      md5: sprite.md5,
+      thumbClass: thumb.className,
+      brushDisplay: window.getComputedStyle(brush).display,
+      blockTypes: window.ScratchJr.getBlocks().map((block) => block.blocktype),
+    };
+  });
+}
+
+describe("sprite paint editing availability", () => {
+  it(
+    "keeps Marty paint editing disabled after dropping a block",
+    async () => {
+      const { browser, page, errors } = await openEditor();
+
+      try {
+        const beforeDrop = await getSelectedSpritePaintState(page);
+        expect(beforeDrop.md5).toBe("Sprites_Marty.svg");
+        expect(beforeDrop.thumbClass).toContain("martynoneditable");
+        expect(beforeDrop.brushDisplay).toBe("none");
+
+        await dragBlockToScripts(page, "#sprite-motion", "#forward_block", "forward");
+
+        const afterDrop = await getSelectedSpritePaintState(page);
+        expect(afterDrop.thumbClass).toContain("martynoneditable");
+        expect(afterDrop.brushDisplay).toBe("none");
+        expect(afterDrop.blockTypes).toContain("forward");
+
+        const paintFrameVisible = await page.evaluate(() => {
+          const brush = window.ScratchJr.getSprite().thumbnail.querySelector(".brush");
+          brush.dispatchEvent(new PointerEvent("pointerdown", {
+            bubbles: true,
+            cancelable: true,
+            pointerType: "mouse",
+          }));
+          return window.getComputedStyle(document.getElementById("paintframe")).display !== "none";
+        });
+        expect(paintFrameVisible).toBe(false);
+        expect(errors).toEqual([]);
+      } finally {
+        await browser.close();
+      }
+    },
+    60_000
+  );
+
   it(
     "disables paint editing for the animated bee in the library and sprite panel",
     async () => {
@@ -231,7 +318,8 @@ describe("animated sprite paint editing", () => {
         expect(layoutState.selectedBackgroundSize).toBe("100% 100%");
         expect(layoutState.name.right).toBeLessThanOrEqual(layoutState.brush.left + 0.5);
         expect(layoutState.brush.left).toBeGreaterThanOrEqual(layoutState.selected.left);
-        expect(layoutState.brush.right).toBeLessThanOrEqual(layoutState.selected.right + 0.5);
+        expect(layoutState.selected.right - layoutState.brush.right)
+          .toBeGreaterThanOrEqual(layoutState.brush.width * 0.1);
         expect(layoutState.brush.top).toBeGreaterThanOrEqual(layoutState.selected.top);
         expect(layoutState.brush.bottom).toBeLessThanOrEqual(layoutState.selected.bottom);
 

package/tests/e2e/blocks-jr-hidden-blocks.e2e.test.js

@@ -164,6 +164,14 @@ const getSpriteScriptState = async (page, spriteId) =>
         };
     }, spriteId);
 
+const getMartySensorPaletteState = page =>
+    page.evaluate(() => ({
+        colour: Boolean(document.getElementById("martycoloursensed_block")),
+        obstacle: Boolean(document.getElementById("martyobstaclesensed_block")),
+        light: Boolean(document.getElementById("martylightsensed_block")),
+        noise: Boolean(document.getElementById("martynoisesensed_block"))
+    }));
+
 describe("Blocks Jr hidden block drop regression", () => {
     beforeAll(async () => {
         server = spawn("python3", ["-m", "http.server", String(PORT), "--directory", "editions/free/src"], {
@@ -259,4 +267,80 @@ describe("Blocks Jr hidden block drop regression", () => {
             await browser.close();
         }
     }, 60000);
+
+    it("always shows standard Marty sensors and gates optional sensor blocks", async () => {
+        const { browser, page, errors } = await openEditor();
+
+        try {
+            await enableMartyMode(page);
+            await page.click("#marty-start");
+            await page.waitForSelector("#martycoloursensed_block", { visible: true });
+            await page.waitForSelector("#martyobstaclesensed_block", { visible: true });
+
+            const unpairedState = await getMartySensorPaletteState(page);
+            expect(unpairedState).toEqual({
+                colour: true,
+                obstacle: true,
+                light: false,
+                noise: false
+            });
+
+            await page.evaluate(() => {
+                window.sensorPolicyTestManager = window.martyManager;
+                window.martyManager = undefined;
+                window.Palette.selectCategory(window.Palette.numcat);
+            });
+            const managerUnavailableState = await getMartySensorPaletteState(page);
+            expect(managerUnavailableState).toEqual({
+                colour: true,
+                obstacle: true,
+                light: false,
+                noise: false
+            });
+
+            await page.evaluate(() => {
+                window.martyManager = window.sensorPolicyTestManager;
+                delete window.sensorPolicyTestManager;
+            });
+
+            await page.evaluate(() => {
+                window.martyManager.addMarty({ id: "sensor-policy-test" });
+                window.martyManager.setMartySensorAvailability("sensor-policy-test", {
+                    colour: false,
+                    obstacle: false,
+                    light: true,
+                    noise: false
+                });
+            });
+            await page.waitForSelector("#martylightsensed_block", { visible: true });
+
+            const lightSensorState = await getMartySensorPaletteState(page);
+            expect(lightSensorState).toEqual({
+                colour: true,
+                obstacle: true,
+                light: true,
+                noise: false
+            });
+
+            await page.evaluate(() => {
+                window.martyManager.setMartySensorAvailability("sensor-policy-test", {
+                    light: false,
+                    noise: true
+                });
+            });
+            await page.waitForSelector("#martynoisesensed_block", { visible: true });
+            await page.waitForFunction(() => !document.getElementById("martylightsensed_block"));
+
+            const noiseSensorState = await getMartySensorPaletteState(page);
+            expect(noiseSensorState).toEqual({
+                colour: true,
+                obstacle: true,
+                light: false,
+                noise: true
+            });
+            expect(errors).toEqual([]);
+        } finally {
+            await browser.close();
+        }
+    }, 60000);
 });

package/tests/e2e/chromium-79-smoke.test.js

@@ -108,13 +108,8 @@ async function assertTutorialOpened(page, tutorialId) {
   expect(tutorialState.tutorialTitle.length).toBeGreaterThan(0);
 }
 
-async function openHiddenExtensionsLibrary(page) {
-  await page.$eval("#addExtensionButton", (button) => {
-    if (!button.disabled || window.getComputedStyle(button).display !== "none") {
-      throw new Error("Expected the extensions entry point to remain hidden and disabled");
-    }
-    button.onclick();
-  });
+async function openExtensionsLibrary(page) {
+  await page.click("#addExtensionButton");
 }
 
 describe("Chromium 79 smoke test", () => {
@@ -132,7 +127,7 @@ describe("Chromium 79 smoke test", () => {
   );
 
   it(
-    "keeps the extension entry hidden and reveals micro:bit controls only while loaded",
+    "keeps the extension entry visible and reveals micro:bit controls only while loaded",
     async () => {
       const { browser, page, errors } = await openPage("/editor.html?mode=edit");
 
@@ -157,9 +152,9 @@ describe("Chromium 79 smoke test", () => {
         });
 
         expect(initialState).toEqual({
-          addButtonDisplay: "none",
-          addButtonAriaHidden: "true",
-          addButtonDisabled: true,
+          addButtonDisplay: "flex",
+          addButtonAriaHidden: "false",
+          addButtonDisabled: false,
           microBitButtonDisplay: "none",
           microBitButtonAriaHidden: "true",
           microBitButtonDisabled: true,
@@ -167,7 +162,7 @@ describe("Chromium 79 smoke test", () => {
           extensionEnabled: false,
         });
 
-        await openHiddenExtensionsLibrary(page);
+        await openExtensionsLibrary(page);
         await page.waitForSelector("#extensionsLibrary.fade.in", { timeout: 30_000 });
         const libraryState = await page.evaluate(() => ({
           title: document.getElementById("extensionsLibraryTitle").textContent.trim(),
@@ -221,9 +216,9 @@ describe("Chromium 79 smoke test", () => {
         });
 
         expect(enabledState).toEqual({
-          addButtonDisplay: "none",
-          addButtonAriaHidden: "true",
-          addButtonDisabled: true,
+          addButtonDisplay: "flex",
+          addButtonAriaHidden: "false",
+          addButtonDisabled: false,
           microBitButtonDisplay: "flex",
           microBitButtonAriaHidden: "false",
           microBitButtonDisabled: false,
@@ -290,7 +285,7 @@ describe("Chromium 79 smoke test", () => {
         });
         expect(blocksAfterInsert).toContain("microbitdisplayclear");
 
-        await openHiddenExtensionsLibrary(page);
+        await openExtensionsLibrary(page);
         await page.waitForSelector("#extensionsLibrary.fade.in", { timeout: 30_000 });
         const loadedLibraryState = await page.evaluate(() => ({
           microBitCardAction: document.getElementById("microBitExtensionCardAction").textContent.trim(),
@@ -339,7 +334,7 @@ describe("Chromium 79 smoke test", () => {
           extensionEnabled: document.getElementById("connectionButtonsArea").classList.contains("extensionEnabled"),
         }));
         expect(unloadedState).toEqual({
-          addButtonDisplay: "none",
+          addButtonDisplay: "flex",
           microBitButtonDisplay: "none",
           extensionsLibraryOpen: false,
           microBitCardAction: "+",

package/tests/e2e/marty-script-activation-paths.e2e.test.js

@@ -249,6 +249,77 @@ describe("Marty script activation paths", () => {
         }
     });
 
+    it("keeps the Marty mode sidebar card and full label stable after block drops", async () => {
+        const { browser, page, errors } = await openPage("/editor.html?mode=edit");
+        try {
+            await waitForEditorReady(page);
+            const spriteCardLayout = await page.evaluate(() => {
+                const card = document.querySelector("#spritecc .spritethumb[aria-pressed=\"true\"]");
+                const label = card && card.querySelector(".sname");
+                if (!card || !label) {
+                    throw new Error("Selected sprite card layout was not found");
+                }
+                return {
+                    cardWidth: card.getBoundingClientRect().width,
+                    labelWidth: label.getBoundingClientRect().width
+                };
+            });
+
+            await setMartyMode(page, true);
+            const getMartyCardLayout = () => page.evaluate(() => {
+                const card = document.getElementById("martyModeSidebarCard");
+                const label = card && card.querySelector(".marty-mode-card-label");
+                if (!card || !label) {
+                    throw new Error("Marty mode sidebar card layout was not found");
+                }
+                const cardStyle = window.getComputedStyle(card);
+                const labelStyle = window.getComputedStyle(label);
+                const cardRect = card.getBoundingClientRect();
+                const labelRect = label.getBoundingClientRect();
+                return {
+                    className: card.className,
+                    cardWidth: cardRect.width,
+                    cardLeft: cardRect.left,
+                    cardRight: cardRect.right,
+                    labelText: label.textContent,
+                    labelWidth: labelRect.width,
+                    labelLeft: labelRect.left,
+                    labelRight: labelRect.right,
+                    labelClientWidth: label.clientWidth,
+                    labelScrollWidth: label.scrollWidth,
+                    hasBrush: Boolean(card.querySelector(".brush")),
+                    backgroundImage: cardStyle.backgroundImage,
+                    backgroundSize: cardStyle.backgroundSize,
+                    overflow: labelStyle.overflow,
+                    textOverflow: labelStyle.textOverflow,
+                    whiteSpace: labelStyle.whiteSpace
+                };
+            });
+            const martyCardLayout = await getMartyCardLayout();
+
+            expect(martyCardLayout.cardWidth).toBeCloseTo(spriteCardLayout.cardWidth, 1);
+            expect(martyCardLayout.labelWidth).toBeGreaterThan(spriteCardLayout.labelWidth);
+            expect(martyCardLayout.labelLeft).toBeGreaterThanOrEqual(martyCardLayout.cardLeft);
+            expect(martyCardLayout.labelRight).toBeLessThanOrEqual(martyCardLayout.cardRight);
+            expect(martyCardLayout.labelText).toBe("Marty Mode");
+            expect(martyCardLayout.hasBrush).toBe(false);
+            expect(martyCardLayout.backgroundImage).toContain("viewOnCompactWideLabel.png");
+            expect(martyCardLayout.backgroundSize).toBe("100% 100%");
+            expect(martyCardLayout).toMatchObject({
+                overflow: "hidden",
+                textOverflow: "ellipsis",
+                whiteSpace: "nowrap"
+            });
+            expect(martyCardLayout.labelScrollWidth).toBeLessThanOrEqual(martyCardLayout.labelClientWidth);
+
+            await dragMartyBlock(page);
+            expect(await getMartyCardLayout()).toEqual(martyCardLayout);
+            expect(errors).toEqual([]);
+        } finally {
+            await browser.close();
+        }
+    }, 60000);
+
     it("activates the script after duplicating a page in Marty mode", async () => {
         const { browser, page, errors } = await openPage("/editor.html?mode=edit");
         try {

package/tests/e2e/microbit-extension-project-reload.e2e.test.js

@@ -119,12 +119,7 @@ async function enableMartyMode(page) {
 }
 
 async function enableMicroBitExtension(page) {
-  await page.$eval("#addExtensionButton", (button) => {
-    if (!button.disabled || window.getComputedStyle(button).display !== "none") {
-      throw new Error("Expected the extensions entry point to remain hidden and disabled");
-    }
-    button.onclick();
-  });
+  await page.click("#addExtensionButton");
   await page.waitForSelector("#extensionsLibrary.fade.in", { timeout: 30_000 });
   await page.click("#microBitExtensionCard");
   await page.waitForFunction(

package/tests/e2e/project-load-progress-loop.e2e.test.js

@@ -110,12 +110,7 @@ async function enableMartyMode(page) {
 }
 
 async function enableMicroBitExtension(page) {
-  await page.$eval("#addExtensionButton", (button) => {
-    if (!button.disabled || window.getComputedStyle(button).display !== "none") {
-      throw new Error("Expected the extensions entry point to remain hidden and disabled");
-    }
-    button.onclick();
-  });
+  await page.click("#addExtensionButton");
   await page.waitForSelector("#extensionsLibrary.fade.in", { timeout: 30_000 });
   await page.click("#microBitExtensionCard");
   await page.waitForFunction(