Skip to content

Commit 0d2a910

Browse files
committed
Merge branch 'main' into scope-toolbox-click
2 parents 5d13995 + c167c4a commit 0d2a910

4 files changed

Lines changed: 9 additions & 0 deletions

File tree

packages/blockly/tests/browser/test/dragger_test.mjs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import * as chai from 'chai';
88
import {testFileLocations, testSetup} from './test_setup.mjs';
99

1010
suite('Dragging into a delete area', function () {
11+
this.timeout(0);
12+
1113
suiteSetup(async function () {
1214
this.browser = await testSetup(testFileLocations.PLAYGROUND);
1315

packages/blockly/tests/browser/test/dropdowndiv_test.mjs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import * as chai from 'chai';
88
import {testFileLocations, testSetup} from './test_setup.mjs';
99

1010
suite('DropDownDiv', function () {
11+
this.timeout(0);
12+
1113
suiteSetup(async function () {
1214
this.browser = await testSetup(testFileLocations.PLAYGROUND);
1315
});

packages/blockly/tests/browser/test/focus_manager_test.mjs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ async function installFocusTestHelpers(browser, fixtureHtml) {
5555
}
5656

5757
suite('FocusManager', function () {
58+
this.timeout(0);
59+
5860
suiteSetup(async function () {
5961
this.browser = await testSetup(testFileLocations.PLAYGROUND);
6062
await installFocusTestHelpers(this.browser, FIXTURE_HTML);

packages/plugins/workspace-minimap/test/minimap_tests.mocha.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,9 @@ suite('Mirroring events', function () {
441441
'<!DOCTYPE html><div id="blocklyDiv"></div>',
442442
);
443443
global.SVGElement = window.SVGElement;
444+
window.HTMLCanvasElement.prototype.getContext = () => ({
445+
measureText: () => ({width: ''}),
446+
});
444447
window.requestAnimationFrame = (callback) => setTimeout(callback, 0);
445448
window.cancelAnimationFrame = (id) => clearTimeout(id);
446449
this.workspace = Blockly.inject('blocklyDiv', {

0 commit comments

Comments
 (0)