test: update XPath expressions for Blockly v12 beta

scratchfoundation · Feb 20, 2025 · 7bb1ace · 7bb1ace
1 parent 42a9f44
commit 7bb1ace
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/test/helpers/selenium-helper.js b/test/helpers/selenium-helper.js
@@ -343,9 +343,12 @@ class SeleniumHelper {
         // then finally click the toolbox text.
         try {
             await this.setTitle(`clickBlocksCategory ${categoryText}`);
-            await this.findByXpath('//div[contains(@class, "blocks_blocks")]');
-            await this.driver.sleep(100);
-            await this.clickText(categoryText, 'div[contains(@class, "blocks_blocks")]');
+
+            const desiredCategoryLabel = `*[contains(text(), "${categoryText}")]`;
+            const anyCategoryContainer = '*[contains(@class, "blocklyToolboxCategoryContainer")]';
+            const desiredCategoryContainer = `//${desiredCategoryLabel}/ancestor::${anyCategoryContainer}`;
+            await this.clickXpath(desiredCategoryContainer);
+
             await this.driver.sleep(500); // Wait for scroll to finish
         } catch (cause) {
             throw await enhanceError(outerError, cause);

diff --git a/test/integration/blocks.test.js b/test/integration/blocks.test.js
@@ -297,7 +297,7 @@ describe('Working with the blocks', () => {
 
     test('Use variable blocks after switching languages', async () => {
         const myVariable = 'my\u00A0variable';
-        const changeVariableByScope = "*[@data-id='data_changevariableby']";
+        const changeVariableByScope = '*[contains(@class, "blocklyFlyout")]//*[contains(@class, "data_changevariableby")]';
 
         await loadUri(uri);