From e1e39065fd78a653f2e2ef19b994d6504f2b1abc Mon Sep 17 00:00:00 2001
From: Mike Harvey <43474485+mikeharv@users.noreply.github.com>
Date: Mon, 10 Aug 2026 13:36:05 -0400
Subject: [PATCH 1/2] chore: scope toolbox click test to the toolbox under test

---
 packages/blockly/tests/mocha/toolbox_test.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/blockly/tests/mocha/toolbox_test.js b/packages/blockly/tests/mocha/toolbox_test.js
index f120e82ea04..d6cced87aa4 100644
--- a/packages/blockly/tests/mocha/toolbox_test.js
+++ b/packages/blockly/tests/mocha/toolbox_test.js
@@ -257,14 +257,12 @@ suite('Toolbox', function () {
       sinon.assert.calledOnce(hideChaffStub);
     });
     test('Category clicked -> Should select category', function () {
-      const categoryXml = document.getElementsByClassName(
-        'blocklyToolboxCategory',
-      )[0];
+      const categoryXml = item.getClickTarget();
       const evt = {
         'target': categoryXml,
         'stopPropagation': () => {},
       };
-      const item = this.toolbox.contents.get(categoryXml.getAttribute('id'));
+      const item = this.toolbox.getToolboxItems()[0];
       const setSelectedSpy = sinon.spy(this.toolbox, 'setSelectedItem');
       const onClickSpy = sinon.spy(item, 'onClick');
       this.toolbox.onClick_(evt);

From 5d139954e735170f636877f6e0d0382b69c1cca6 Mon Sep 17 00:00:00 2001
From: Mike Harvey <43474485+mikeharv@users.noreply.github.com>
Date: Mon, 10 Aug 2026 13:43:13 -0400
Subject: [PATCH 2/2] chore: swap declaration order, whoops

---
 packages/blockly/tests/mocha/toolbox_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/blockly/tests/mocha/toolbox_test.js b/packages/blockly/tests/mocha/toolbox_test.js
index d6cced87aa4..aa408e4abe6 100644
--- a/packages/blockly/tests/mocha/toolbox_test.js
+++ b/packages/blockly/tests/mocha/toolbox_test.js
@@ -257,12 +257,12 @@ suite('Toolbox', function () {
       sinon.assert.calledOnce(hideChaffStub);
     });
     test('Category clicked -> Should select category', function () {
+      const item = this.toolbox.getToolboxItems()[0];
       const categoryXml = item.getClickTarget();
       const evt = {
         'target': categoryXml,
         'stopPropagation': () => {},
       };
-      const item = this.toolbox.getToolboxItems()[0];
       const setSelectedSpy = sinon.spy(this.toolbox, 'setSelectedItem');
       const onClickSpy = sinon.spy(item, 'onClick');
       this.toolbox.onClick_(evt);