mirror of
https://github.com/google/blockly.git
synced 2026-01-08 09:30:06 +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.
304 lines
10 KiB
JavaScript
304 lines
10 KiB
JavaScript
/**
|
|
* @license
|
|
* Copyright 2019 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
import {
|
|
sharedTestSetup,
|
|
sharedTestTeardown,
|
|
} from './test_helpers/setup_teardown.js';
|
|
|
|
suite('Inputs', function () {
|
|
setup(function () {
|
|
sharedTestSetup.call(this);
|
|
Blockly.defineBlocksWithJsonArray([
|
|
{
|
|
'type': 'empty_block',
|
|
'message0': '',
|
|
'args0': [],
|
|
},
|
|
]);
|
|
|
|
this.workspace = Blockly.inject('blocklyDiv');
|
|
this.block = Blockly.Xml.domToBlock(
|
|
Blockly.utils.xml.textToDom('<block type="empty_block"/>'),
|
|
this.workspace,
|
|
);
|
|
|
|
this.renderStub = sinon.stub(this.block, 'queueRender');
|
|
this.bumpNeighboursStub = sinon.stub(this.block, 'bumpNeighbours');
|
|
|
|
this.dummy = this.block.appendDummyInput('DUMMY');
|
|
this.value = this.block.appendValueInput('VALUE');
|
|
this.statement = this.block.appendStatementInput('STATEMENT');
|
|
|
|
this.renderStub.resetHistory();
|
|
this.bumpNeighboursStub.resetHistory();
|
|
});
|
|
teardown(function () {
|
|
sharedTestTeardown.call(this);
|
|
});
|
|
suite('Insert Field At', function () {
|
|
suite('Index Bounds', function () {
|
|
test('< 0', function () {
|
|
const field = new Blockly.FieldLabel('field');
|
|
chai.assert.throws(function () {
|
|
this.dummy.insertFieldAt(-1, field);
|
|
});
|
|
});
|
|
test('> length', function () {
|
|
const field = new Blockly.FieldLabel('field');
|
|
chai.assert.throws(function () {
|
|
this.dummy.insertFieldAt(1, field);
|
|
});
|
|
});
|
|
});
|
|
suite('Values', function () {
|
|
// We're mostly just testing that it doesn't throw errors.
|
|
test('Field', function () {
|
|
const field = new Blockly.FieldLabel('field');
|
|
this.dummy.insertFieldAt(0, field);
|
|
chai.assert.equal(this.dummy.fieldRow[0], field);
|
|
});
|
|
test('String', function () {
|
|
this.dummy.insertFieldAt(0, 'field');
|
|
chai.assert.instanceOf(this.dummy.fieldRow[0], Blockly.FieldLabel);
|
|
});
|
|
test('String w/ field_label overwritten', function () {
|
|
Blockly.fieldRegistry.unregister('field_label');
|
|
Blockly.fieldRegistry.register('field_label', Blockly.FieldNumber);
|
|
|
|
this.dummy.insertFieldAt(0, '1');
|
|
chai.assert.instanceOf(this.dummy.fieldRow[0], Blockly.FieldNumber);
|
|
|
|
Blockly.fieldRegistry.unregister('field_label');
|
|
Blockly.fieldRegistry.register('field_label', Blockly.FieldLabel);
|
|
});
|
|
test('Empty String', function () {
|
|
this.dummy.insertFieldAt(0, '');
|
|
chai.assert.isEmpty(this.dummy.fieldRow);
|
|
});
|
|
test('Empty String W/ Name', function () {
|
|
this.dummy.insertFieldAt(0, '', 'NAME');
|
|
chai.assert.instanceOf(this.dummy.fieldRow[0], Blockly.FieldLabel);
|
|
});
|
|
test('Null', function () {
|
|
this.dummy.insertFieldAt(0, null);
|
|
chai.assert.isEmpty(this.dummy.fieldRow);
|
|
});
|
|
test('Undefined', function () {
|
|
this.dummy.insertFieldAt(0, undefined);
|
|
chai.assert.isEmpty(this.dummy.fieldRow);
|
|
});
|
|
});
|
|
suite('Prefixes and Suffixes', function () {
|
|
test('Prefix', function () {
|
|
const field = new Blockly.FieldLabel('field');
|
|
const prefix = new Blockly.FieldLabel('prefix');
|
|
field.prefixField = prefix;
|
|
|
|
this.dummy.appendField(field);
|
|
chai.assert.deepEqual(this.dummy.fieldRow, [prefix, field]);
|
|
});
|
|
test('Suffix', function () {
|
|
const field = new Blockly.FieldLabel('field');
|
|
const suffix = new Blockly.FieldLabel('suffix');
|
|
field.suffixField = suffix;
|
|
|
|
this.dummy.appendField(field);
|
|
chai.assert.deepEqual(this.dummy.fieldRow, [field, suffix]);
|
|
});
|
|
test('Prefix and Suffix', function () {
|
|
const field = new Blockly.FieldLabel('field');
|
|
const prefix = new Blockly.FieldLabel('prefix');
|
|
const suffix = new Blockly.FieldLabel('suffix');
|
|
field.prefixField = prefix;
|
|
field.suffixField = suffix;
|
|
|
|
this.dummy.appendField(field);
|
|
chai.assert.deepEqual(this.dummy.fieldRow, [prefix, field, suffix]);
|
|
});
|
|
test('Dropdown - Prefix', function () {
|
|
const field = new Blockly.FieldDropdown([
|
|
['prefix option1', 'OPTION1'],
|
|
['prefix option2', 'OPTION2'],
|
|
]);
|
|
|
|
this.dummy.appendField(field);
|
|
chai.assert.equal(this.dummy.fieldRow.length, 2);
|
|
});
|
|
test('Dropdown - Suffix', function () {
|
|
const field = new Blockly.FieldDropdown([
|
|
['option1 suffix', 'OPTION1'],
|
|
['option2 suffix', 'OPTION2'],
|
|
]);
|
|
|
|
this.dummy.appendField(field);
|
|
chai.assert.equal(this.dummy.fieldRow.length, 2);
|
|
});
|
|
test('Dropdown - Prefix and Suffix', function () {
|
|
const field = new Blockly.FieldDropdown([
|
|
['prefix option1 suffix', 'OPTION1'],
|
|
['prefix option2 suffix', 'OPTION2'],
|
|
]);
|
|
|
|
this.dummy.appendField(field);
|
|
chai.assert.equal(this.dummy.fieldRow.length, 3);
|
|
});
|
|
});
|
|
suite('Field Initialization', function () {
|
|
test('Rendered', function () {
|
|
const field = new Blockly.FieldLabel('field');
|
|
const setBlockSpy = sinon.spy(field, 'setSourceBlock');
|
|
const initSpy = sinon.spy(field, 'init');
|
|
|
|
this.dummy.insertFieldAt(0, field);
|
|
sinon.assert.calledOnce(setBlockSpy);
|
|
chai.assert.equal(setBlockSpy.getCall(0).args[0], this.block);
|
|
sinon.assert.calledOnce(initSpy);
|
|
sinon.assert.calledOnce(this.renderStub);
|
|
sinon.assert.calledOnce(this.bumpNeighboursStub);
|
|
|
|
setBlockSpy.restore();
|
|
initSpy.restore();
|
|
});
|
|
// TODO: InsertFieldAt does not properly handle initialization in
|
|
// headless mode.
|
|
test.skip('Headless', function () {
|
|
const field = new Blockly.FieldLabel('field');
|
|
const setBlockSpy = sinon.spy(field, 'setSourceBlock');
|
|
const initModelSpy = sinon.spy(field, 'initModel');
|
|
|
|
this.block.rendered = false;
|
|
|
|
this.dummy.insertFieldAt(0, field);
|
|
sinon.assert.calledOnce(setBlockSpy);
|
|
chai.assert.equal(setBlockSpy.getCall(0).args[0], this.block);
|
|
sinon.assert.calledOnce(initModelSpy);
|
|
sinon.assert.notCalled(this.renderStub);
|
|
sinon.assert.notCalled(this.bumpNeighboursStub);
|
|
|
|
setBlockSpy.restore();
|
|
initModelSpy.restore();
|
|
});
|
|
});
|
|
});
|
|
suite('Remove Field', function () {
|
|
test('Field Not Found', function () {
|
|
chai.assert.throws(function () {
|
|
this.dummy.removeField('FIELD');
|
|
});
|
|
});
|
|
test('Rendered', function () {
|
|
const field = new Blockly.FieldLabel('field');
|
|
const disposeSpy = sinon.spy(field, 'dispose');
|
|
this.dummy.appendField(field, 'FIELD');
|
|
|
|
this.renderStub.resetHistory();
|
|
this.bumpNeighboursStub.resetHistory();
|
|
|
|
this.dummy.removeField('FIELD');
|
|
sinon.assert.calledOnce(disposeSpy);
|
|
sinon.assert.calledOnce(this.renderStub);
|
|
sinon.assert.calledOnce(this.bumpNeighboursStub);
|
|
});
|
|
test('Headless', function () {
|
|
const field = new Blockly.FieldLabel('field');
|
|
const disposeSpy = sinon.spy(field, 'dispose');
|
|
this.dummy.appendField(field, 'FIELD');
|
|
|
|
this.renderStub.resetHistory();
|
|
this.bumpNeighboursStub.resetHistory();
|
|
|
|
this.block.rendered = false;
|
|
|
|
this.dummy.removeField('FIELD');
|
|
sinon.assert.calledOnce(disposeSpy);
|
|
sinon.assert.notCalled(this.renderStub);
|
|
sinon.assert.notCalled(this.bumpNeighboursStub);
|
|
});
|
|
});
|
|
suite('Field Ordering/Manipulation', function () {
|
|
setup(function () {
|
|
this.a = new Blockly.FieldLabel('a');
|
|
this.b = new Blockly.FieldLabel('b');
|
|
this.c = new Blockly.FieldLabel('c');
|
|
});
|
|
test('Append A, B, C', function () {
|
|
this.dummy.appendField(this.a, 'A');
|
|
this.dummy.appendField(this.b, 'B');
|
|
this.dummy.appendField(this.c, 'C');
|
|
|
|
chai.assert.deepEqual(this.dummy.fieldRow, [this.a, this.b, this.c]);
|
|
});
|
|
test('Append B, C; Insert A at Start', function () {
|
|
this.dummy.appendField(this.b, 'B');
|
|
this.dummy.appendField(this.c, 'C');
|
|
this.dummy.insertFieldAt(0, this.a, 'A');
|
|
|
|
chai.assert.deepEqual(this.dummy.fieldRow, [this.a, this.b, this.c]);
|
|
});
|
|
test('Append A, C; Insert B Between', function () {
|
|
this.dummy.appendField(this.a, 'A');
|
|
this.dummy.appendField(this.c, 'C');
|
|
this.dummy.insertFieldAt(1, this.b, 'B');
|
|
|
|
chai.assert.deepEqual(this.dummy.fieldRow, [this.a, this.b, this.c]);
|
|
});
|
|
test('Append A, B; Insert C at End', function () {
|
|
this.dummy.appendField(this.a, 'A');
|
|
this.dummy.appendField(this.b, 'B');
|
|
this.dummy.insertFieldAt(2, this.c, 'C');
|
|
|
|
chai.assert.deepEqual(this.dummy.fieldRow, [this.a, this.b, this.c]);
|
|
});
|
|
test('Append A, B, C; Remove A, B, C', function () {
|
|
this.dummy.appendField(this.a, 'A');
|
|
this.dummy.appendField(this.b, 'B');
|
|
this.dummy.appendField(this.c, 'C');
|
|
|
|
this.dummy.removeField('A');
|
|
this.dummy.removeField('B');
|
|
this.dummy.removeField('C');
|
|
|
|
chai.assert.isEmpty(this.dummy.fieldRow);
|
|
});
|
|
test('Append A, B, C; Remove A', function () {
|
|
this.dummy.appendField(this.a, 'A');
|
|
this.dummy.appendField(this.b, 'B');
|
|
this.dummy.appendField(this.c, 'C');
|
|
|
|
this.dummy.removeField('A');
|
|
|
|
chai.assert.deepEqual(this.dummy.fieldRow, [this.b, this.c]);
|
|
});
|
|
test('Append A, B, C; Remove B', function () {
|
|
this.dummy.appendField(this.a, 'A');
|
|
this.dummy.appendField(this.b, 'B');
|
|
this.dummy.appendField(this.c, 'C');
|
|
|
|
this.dummy.removeField('B');
|
|
|
|
chai.assert.deepEqual(this.dummy.fieldRow, [this.a, this.c]);
|
|
});
|
|
test('Append A, B, C; Remove C', function () {
|
|
this.dummy.appendField(this.a, 'A');
|
|
this.dummy.appendField(this.b, 'B');
|
|
this.dummy.appendField(this.c, 'C');
|
|
|
|
this.dummy.removeField('C');
|
|
|
|
chai.assert.deepEqual(this.dummy.fieldRow, [this.a, this.b]);
|
|
});
|
|
test('Append A, B; Remove A; Append C', function () {
|
|
this.dummy.appendField(this.a, 'A');
|
|
this.dummy.appendField(this.b, 'B');
|
|
this.dummy.removeField('A');
|
|
this.dummy.appendField(this.c, 'C');
|
|
|
|
chai.assert.deepEqual(this.dummy.fieldRow, [this.b, this.c]);
|
|
});
|
|
});
|
|
});
|