mirror of
https://github.com/google/blockly.git
synced 2026-01-08 01:20:12 +01:00
6f20ac290d
* fix(build): Have buildShims clean up up after itself
We need to create a build/package.json file to allow node.js to
load build/src/core/blockly.js and the other chunk entry points
as ES modules (it forcibly assumes .js means CJS even if one is
trying to import, unless package.json says {"type": "module"}),
but this interferes with scripts/migration/js2ts doing a
require('build/deps.js'), which is _not_ an ES module.
Specific error message was:
/Users/cpcallen/src/blockly/scripts/migration/js2ts:56
require(path.resolve(__dirname, '../../build/deps.js'));
^
Error [ERR_REQUIRE_ESM]: require() of ES Module
/Users/cpcallen/src/blockly/build/deps.js from /Users/cpcallen/src/blockly/scripts/migration/js2ts
not supported.
deps.js is treated as an ES module file as it is a .js file whose
nearest parent package.json contains "type": "module" which
declares all .js files in that package scope as ES modules.
Instead rename deps.js to end in .cjs, change the requiring code
to use dynamic import() which is available in all CommonJS
modules, or change "type": "module" to "type": "commonjs" in
/Users/cpcallen/src/blockly/build/package.json to treat all .js
files as CommonJS (using .mjs for all ES modules instead).
at Object.<anonymous> (/Users/cpcallen/src/blockly/scripts/migration/js2ts:56:1) {
code: 'ERR_REQUIRE_ESM'
}
* chore(tests): Reorder to put interesting script nearer top of file
* chore(tests): Add missing imports of closure/goog/goog.js
These modules were depending on being loaded via the
debug module loader, which cannot be used without first loading
base.js as a script, and thereby defining goog.declareModuleId
as a side effect—but if they are to be loaded via direct import
statements then they need to actually import their own
dependencies.
This is a temporary measure as soon the goog.declareMouleId
calls can themselves be deleted.
* refactor(tests): Use import instead of bootstrap to load Blockly
* chores(build): Stop generating deps.mocha.js
This file was only needed by tests/mocha/index.html's use of
the debug module loader (via bootstrap.js), which has now been
removed.
* chore(tests): Remove unneeded goog.declareModuleId calls
These were only needed because these modules were previously
being loaded by goog.require and/or goog.bootstrap.
* chores(tests): Remove dead code
We are fully committed to proper modules now.
370 lines
11 KiB
JavaScript
370 lines
11 KiB
JavaScript
/**
|
|
* @license
|
|
* Copyright 2022 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
import {
|
|
sharedTestSetup,
|
|
sharedTestTeardown,
|
|
} from './test_helpers/setup_teardown.js';
|
|
import {
|
|
defineRowBlock,
|
|
defineRowToStackBlock,
|
|
defineStackBlock,
|
|
} from './test_helpers/block_definitions.js';
|
|
|
|
suite('Insertion marker manager', function () {
|
|
setup(function () {
|
|
sharedTestSetup.call(this);
|
|
defineRowBlock();
|
|
defineStackBlock();
|
|
defineRowToStackBlock();
|
|
this.workspace = Blockly.inject('blocklyDiv');
|
|
});
|
|
teardown(function () {
|
|
sharedTestTeardown.call(this);
|
|
});
|
|
|
|
suite('Creating markers', function () {
|
|
function createBlocksAndManager(workspace, state) {
|
|
Blockly.serialization.workspaces.load(state, workspace);
|
|
const block = workspace.getBlockById('first');
|
|
const manager = new Blockly.InsertionMarkerManager(block);
|
|
return manager;
|
|
}
|
|
|
|
test('One stack block creates one marker', function () {
|
|
const state = {
|
|
'blocks': {
|
|
'blocks': [
|
|
{
|
|
'type': 'stack_block',
|
|
'id': 'first',
|
|
},
|
|
],
|
|
},
|
|
};
|
|
const manager = createBlocksAndManager(this.workspace, state);
|
|
const markers = manager.getInsertionMarkers();
|
|
chai.assert.equal(markers.length, 1);
|
|
});
|
|
|
|
test('Two stack blocks create two markers', function () {
|
|
const state = {
|
|
'blocks': {
|
|
'blocks': [
|
|
{
|
|
'type': 'stack_block',
|
|
'id': 'first',
|
|
'next': {
|
|
'block': {
|
|
'type': 'stack_block',
|
|
'id': 'second',
|
|
},
|
|
},
|
|
},
|
|
],
|
|
},
|
|
};
|
|
const manager = createBlocksAndManager(this.workspace, state);
|
|
const markers = manager.getInsertionMarkers();
|
|
chai.assert.equal(markers.length, 2);
|
|
});
|
|
|
|
test('Three stack blocks create two markers', function () {
|
|
const state = {
|
|
'blocks': {
|
|
'blocks': [
|
|
{
|
|
'type': 'stack_block',
|
|
'id': 'first',
|
|
'next': {
|
|
'block': {
|
|
'type': 'stack_block',
|
|
'id': 'second',
|
|
'next': {
|
|
'block': {
|
|
'type': 'stack_block',
|
|
'id': 'third',
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
],
|
|
},
|
|
};
|
|
const manager = createBlocksAndManager(this.workspace, state);
|
|
const markers = manager.getInsertionMarkers();
|
|
chai.assert.equal(markers.length, 2);
|
|
});
|
|
|
|
test('One value block creates one marker', function () {
|
|
const state = {
|
|
'blocks': {
|
|
'blocks': [
|
|
{
|
|
'type': 'row_block',
|
|
'id': 'first',
|
|
},
|
|
],
|
|
},
|
|
};
|
|
const manager = createBlocksAndManager(this.workspace, state);
|
|
const markers = manager.getInsertionMarkers();
|
|
chai.assert.equal(markers.length, 1);
|
|
});
|
|
|
|
test('Two value blocks create one marker', function () {
|
|
const state = {
|
|
'blocks': {
|
|
'blocks': [
|
|
{
|
|
'type': 'row_block',
|
|
'id': 'first',
|
|
'inputs': {
|
|
'INPUT': {
|
|
'block': {
|
|
'type': 'row_block',
|
|
'id': 'second',
|
|
},
|
|
},
|
|
},
|
|
},
|
|
],
|
|
},
|
|
};
|
|
const manager = createBlocksAndManager(this.workspace, state);
|
|
const markers = manager.getInsertionMarkers();
|
|
chai.assert.equal(markers.length, 1);
|
|
});
|
|
|
|
test('One row to stack block creates one marker', function () {
|
|
const state = {
|
|
'blocks': {
|
|
'blocks': [
|
|
{
|
|
'type': 'row_to_stack_block',
|
|
'id': 'first',
|
|
},
|
|
],
|
|
},
|
|
};
|
|
const manager = createBlocksAndManager(this.workspace, state);
|
|
const markers = manager.getInsertionMarkers();
|
|
chai.assert.equal(markers.length, 1);
|
|
});
|
|
|
|
test('Row to stack block with child creates two markers', function () {
|
|
const state = {
|
|
'blocks': {
|
|
'blocks': [
|
|
{
|
|
'type': 'row_to_stack_block',
|
|
'id': 'first',
|
|
'next': {
|
|
'block': {
|
|
'type': 'stack_block',
|
|
'id': 'second',
|
|
},
|
|
},
|
|
},
|
|
],
|
|
},
|
|
};
|
|
const manager = createBlocksAndManager(this.workspace, state);
|
|
const markers = manager.getInsertionMarkers();
|
|
chai.assert.equal(markers.length, 2);
|
|
});
|
|
});
|
|
|
|
suite('Would delete block', function () {
|
|
setup(function () {
|
|
const state = {
|
|
'blocks': {
|
|
'blocks': [
|
|
{
|
|
'type': 'stack_block',
|
|
'id': 'first',
|
|
},
|
|
],
|
|
},
|
|
};
|
|
Blockly.serialization.workspaces.load(state, this.workspace);
|
|
this.block = this.workspace.getBlockById('first');
|
|
this.manager = new Blockly.InsertionMarkerManager(this.block);
|
|
|
|
const componentManager = this.workspace.getComponentManager();
|
|
this.stub = sinon.stub(componentManager, 'hasCapability');
|
|
this.dxy = new Blockly.utils.Coordinate(0, 0);
|
|
});
|
|
|
|
test('Over delete area and accepted would delete', function () {
|
|
this.stub
|
|
.withArgs(
|
|
'fakeDragTarget',
|
|
Blockly.ComponentManager.Capability.DELETE_AREA,
|
|
)
|
|
.returns(true);
|
|
const fakeDragTarget = {
|
|
wouldDelete: sinon.fake.returns(true),
|
|
id: 'fakeDragTarget',
|
|
};
|
|
this.manager.update(this.dxy, fakeDragTarget);
|
|
chai.assert.isTrue(this.manager.wouldDeleteBlock);
|
|
});
|
|
|
|
test('Over delete area and rejected would not delete', function () {
|
|
this.stub
|
|
.withArgs(
|
|
'fakeDragTarget',
|
|
Blockly.ComponentManager.Capability.DELETE_AREA,
|
|
)
|
|
.returns(true);
|
|
const fakeDragTarget = {
|
|
wouldDelete: sinon.fake.returns(false),
|
|
id: 'fakeDragTarget',
|
|
};
|
|
this.manager.update(this.dxy, fakeDragTarget);
|
|
chai.assert.isFalse(this.manager.wouldDeleteBlock);
|
|
});
|
|
|
|
test('Drag target is not a delete area would not delete', function () {
|
|
this.stub
|
|
.withArgs(
|
|
'fakeDragTarget',
|
|
Blockly.ComponentManager.Capability.DELETE_AREA,
|
|
)
|
|
.returns(false);
|
|
const fakeDragTarget = {
|
|
wouldDelete: sinon.fake.returns(false),
|
|
id: 'fakeDragTarget',
|
|
};
|
|
this.manager.update(this.dxy, fakeDragTarget);
|
|
chai.assert.isFalse(this.manager.wouldDeleteBlock);
|
|
});
|
|
|
|
test('Not over drag target would not delete', function () {
|
|
this.manager.update(this.dxy, null);
|
|
chai.assert.isFalse(this.manager.wouldDeleteBlock);
|
|
});
|
|
});
|
|
|
|
suite('Would connect stack blocks', function () {
|
|
setup(function () {
|
|
const state = {
|
|
'blocks': {
|
|
'blocks': [
|
|
{
|
|
'type': 'stack_block',
|
|
'id': 'first',
|
|
'x': 0,
|
|
'y': 0,
|
|
},
|
|
{
|
|
'type': 'stack_block',
|
|
'id': 'other',
|
|
'x': 200,
|
|
'y': 200,
|
|
},
|
|
],
|
|
},
|
|
};
|
|
Blockly.serialization.workspaces.load(state, this.workspace);
|
|
this.block = this.workspace.getBlockById('first');
|
|
this.block.setDragging(true);
|
|
this.manager = new Blockly.InsertionMarkerManager(this.block);
|
|
});
|
|
|
|
test('No other blocks nearby would not connect', function () {
|
|
this.manager.update(new Blockly.utils.Coordinate(0, 0), null);
|
|
chai.assert.isFalse(this.manager.wouldConnectBlock());
|
|
});
|
|
|
|
test('Near other block and above would connect before', function () {
|
|
this.manager.update(new Blockly.utils.Coordinate(200, 190), null);
|
|
chai.assert.isTrue(this.manager.wouldConnectBlock());
|
|
const markers = this.manager.getInsertionMarkers();
|
|
chai.assert.equal(markers.length, 1);
|
|
const marker = markers[0];
|
|
chai.assert.isTrue(marker.nextConnection.isConnected());
|
|
});
|
|
|
|
test('Near other block and below would connect after', function () {
|
|
this.manager.update(new Blockly.utils.Coordinate(200, 210), null);
|
|
chai.assert.isTrue(this.manager.wouldConnectBlock());
|
|
const markers = this.manager.getInsertionMarkers();
|
|
chai.assert.equal(markers.length, 1);
|
|
const marker = markers[0];
|
|
chai.assert.isTrue(marker.previousConnection.isConnected());
|
|
});
|
|
|
|
test('Near other block and left would connect', function () {
|
|
this.manager.update(new Blockly.utils.Coordinate(190, 200), null);
|
|
chai.assert.isTrue(this.manager.wouldConnectBlock());
|
|
});
|
|
|
|
test('Near other block and right would connect', function () {
|
|
this.manager.update(new Blockly.utils.Coordinate(210, 200), null);
|
|
chai.assert.isTrue(this.manager.wouldConnectBlock());
|
|
});
|
|
});
|
|
|
|
suite('Would connect row blocks', function () {
|
|
setup(function () {
|
|
const state = {
|
|
'blocks': {
|
|
'blocks': [
|
|
{
|
|
'type': 'row_block',
|
|
'id': 'first',
|
|
'x': 0,
|
|
'y': 0,
|
|
},
|
|
{
|
|
'type': 'row_block',
|
|
'id': 'other',
|
|
'x': 200,
|
|
'y': 200,
|
|
},
|
|
],
|
|
},
|
|
};
|
|
Blockly.serialization.workspaces.load(state, this.workspace);
|
|
this.block = this.workspace.getBlockById('first');
|
|
this.block.setDragging(true);
|
|
this.manager = new Blockly.InsertionMarkerManager(this.block);
|
|
});
|
|
|
|
test('No other blocks nearby would not connect', function () {
|
|
this.manager.update(new Blockly.utils.Coordinate(0, 0), null);
|
|
chai.assert.isFalse(this.manager.wouldConnectBlock());
|
|
});
|
|
|
|
test('Near other block and above would connect', function () {
|
|
this.manager.update(new Blockly.utils.Coordinate(200, 190), null);
|
|
chai.assert.isTrue(this.manager.wouldConnectBlock());
|
|
});
|
|
|
|
test('Near other block and below would connect', function () {
|
|
this.manager.update(new Blockly.utils.Coordinate(200, 210), null);
|
|
chai.assert.isTrue(this.manager.wouldConnectBlock());
|
|
});
|
|
|
|
test('Near other block and left would connect before', function () {
|
|
this.manager.update(new Blockly.utils.Coordinate(190, 200), null);
|
|
chai.assert.isTrue(this.manager.wouldConnectBlock());
|
|
const markers = this.manager.getInsertionMarkers();
|
|
chai.assert.isTrue(markers[0].getInput('INPUT').connection.isConnected());
|
|
});
|
|
|
|
test('Near other block and right would connect after', function () {
|
|
this.manager.update(new Blockly.utils.Coordinate(210, 200), null);
|
|
chai.assert.isTrue(this.manager.wouldConnectBlock());
|
|
const markers = this.manager.getInsertionMarkers();
|
|
chai.assert.isTrue(markers[0].outputConnection.isConnected());
|
|
});
|
|
});
|
|
});
|