mirror of
https://github.com/google/blockly.git
synced 2026-01-07 00:50:27 +01:00
* 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.
364 lines
11 KiB
JavaScript
364 lines
11 KiB
JavaScript
/**
|
|
* @license
|
|
* Copyright 2020 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
import * as Blockly from '../../build/src/core/blockly.js';
|
|
import {createKeyDownEvent} from './test_helpers/user_input.js';
|
|
import {defineStackBlock} from './test_helpers/block_definitions.js';
|
|
import {
|
|
sharedTestSetup,
|
|
sharedTestTeardown,
|
|
} from './test_helpers/setup_teardown.js';
|
|
|
|
suite('Key Down', function () {
|
|
setup(function () {
|
|
sharedTestSetup.call(this);
|
|
this.workspace = Blockly.inject('blocklyDiv', {});
|
|
});
|
|
teardown(function () {
|
|
sharedTestTeardown.call(this);
|
|
});
|
|
|
|
/**
|
|
* Creates a block and sets it as Blockly.selected.
|
|
* @param {Blockly.Workspace} workspace The workspace to create a new block on.
|
|
* @return {Blockly.Block} The block being selected.
|
|
*/
|
|
function setSelectedBlock(workspace) {
|
|
defineStackBlock();
|
|
const block = workspace.newBlock('stack_block');
|
|
Blockly.common.setSelected(block);
|
|
return block;
|
|
}
|
|
|
|
/**
|
|
* Creates a test for not running keyDown events when the workspace is in read only mode.
|
|
* @param {Object} keyEvent Mocked key down event. Use createKeyDownEvent.
|
|
* @param {string=} opt_name An optional name for the test case.
|
|
*/
|
|
function runReadOnlyTest(keyEvent, opt_name) {
|
|
const name = opt_name ? opt_name : 'Not called when readOnly is true';
|
|
test(name, function () {
|
|
this.workspace.options.readOnly = true;
|
|
document.dispatchEvent(keyEvent);
|
|
sinon.assert.notCalled(this.hideChaffSpy);
|
|
});
|
|
}
|
|
|
|
suite('Escape', function () {
|
|
setup(function () {
|
|
this.event = createKeyDownEvent(Blockly.utils.KeyCodes.ESC);
|
|
this.hideChaffSpy = sinon.spy(
|
|
Blockly.WorkspaceSvg.prototype,
|
|
'hideChaff',
|
|
);
|
|
});
|
|
test('Simple', function () {
|
|
document.dispatchEvent(this.event);
|
|
sinon.assert.calledOnce(this.hideChaffSpy);
|
|
});
|
|
runReadOnlyTest(createKeyDownEvent(Blockly.utils.KeyCodes.ESC));
|
|
test('Not called when focus is on an HTML input', function () {
|
|
const event = createKeyDownEvent(Blockly.utils.KeyCodes.ESC);
|
|
const input = document.createElement('textarea');
|
|
input.dispatchEvent(event);
|
|
sinon.assert.notCalled(this.hideChaffSpy);
|
|
});
|
|
test('Not called on hidden workspaces', function () {
|
|
this.workspace.isVisible_ = false;
|
|
document.dispatchEvent(this.event);
|
|
sinon.assert.notCalled(this.hideChaffSpy);
|
|
});
|
|
});
|
|
|
|
suite('Delete Block', function () {
|
|
setup(function () {
|
|
this.hideChaffSpy = sinon.spy(
|
|
Blockly.WorkspaceSvg.prototype,
|
|
'hideChaff',
|
|
);
|
|
setSelectedBlock(this.workspace);
|
|
this.deleteSpy = sinon.spy(Blockly.common.getSelected(), 'dispose');
|
|
});
|
|
const testCases = [
|
|
['Delete', createKeyDownEvent(Blockly.utils.KeyCodes.DELETE)],
|
|
['Backspace', createKeyDownEvent(Blockly.utils.KeyCodes.BACKSPACE)],
|
|
];
|
|
// Delete a block.
|
|
suite('Simple', function () {
|
|
testCases.forEach(function (testCase) {
|
|
const testCaseName = testCase[0];
|
|
const keyEvent = testCase[1];
|
|
test(testCaseName, function () {
|
|
document.dispatchEvent(keyEvent);
|
|
sinon.assert.calledOnce(this.hideChaffSpy);
|
|
sinon.assert.calledOnce(this.deleteSpy);
|
|
});
|
|
});
|
|
});
|
|
// Do not delete a block if workspace is in readOnly mode.
|
|
suite('Not called when readOnly is true', function () {
|
|
testCases.forEach(function (testCase) {
|
|
const testCaseName = testCase[0];
|
|
const keyEvent = testCase[1];
|
|
runReadOnlyTest(keyEvent, testCaseName);
|
|
});
|
|
});
|
|
});
|
|
|
|
suite('Copy', function () {
|
|
setup(function () {
|
|
this.block = setSelectedBlock(this.workspace);
|
|
this.copySpy = sinon.spy(this.block, 'toCopyData');
|
|
this.hideChaffSpy = sinon.spy(
|
|
Blockly.WorkspaceSvg.prototype,
|
|
'hideChaff',
|
|
);
|
|
});
|
|
const testCases = [
|
|
[
|
|
'Control C',
|
|
createKeyDownEvent(Blockly.utils.KeyCodes.C, [
|
|
Blockly.utils.KeyCodes.CTRL,
|
|
]),
|
|
],
|
|
[
|
|
'Meta C',
|
|
createKeyDownEvent(Blockly.utils.KeyCodes.C, [
|
|
Blockly.utils.KeyCodes.META,
|
|
]),
|
|
],
|
|
[
|
|
'Alt C',
|
|
createKeyDownEvent(Blockly.utils.KeyCodes.C, [
|
|
Blockly.utils.KeyCodes.ALT,
|
|
]),
|
|
],
|
|
];
|
|
// Copy a block.
|
|
suite('Simple', function () {
|
|
testCases.forEach(function (testCase) {
|
|
const testCaseName = testCase[0];
|
|
const keyEvent = testCase[1];
|
|
test(testCaseName, function () {
|
|
document.dispatchEvent(keyEvent);
|
|
sinon.assert.calledOnce(this.copySpy);
|
|
sinon.assert.calledOnce(this.hideChaffSpy);
|
|
});
|
|
});
|
|
});
|
|
// Do not copy a block if a workspace is in readonly mode.
|
|
suite('Not called when readOnly is true', function () {
|
|
testCases.forEach(function (testCase) {
|
|
const testCaseName = testCase[0];
|
|
const keyEvent = testCase[1];
|
|
runReadOnlyTest(keyEvent, testCaseName);
|
|
});
|
|
});
|
|
// Do not copy a block if a gesture is in progress.
|
|
suite('Gesture in progress', function () {
|
|
testCases.forEach(function (testCase) {
|
|
const testCaseName = testCase[0];
|
|
const keyEvent = testCase[1];
|
|
test(testCaseName, function () {
|
|
sinon.stub(Blockly.Gesture, 'inProgress').returns(true);
|
|
document.dispatchEvent(keyEvent);
|
|
sinon.assert.notCalled(this.copySpy);
|
|
sinon.assert.notCalled(this.hideChaffSpy);
|
|
});
|
|
});
|
|
});
|
|
// Do not copy a block if is is not deletable.
|
|
suite('Block is not deletable', function () {
|
|
testCases.forEach(function (testCase) {
|
|
const testCaseName = testCase[0];
|
|
const keyEvent = testCase[1];
|
|
test(testCaseName, function () {
|
|
sinon
|
|
.stub(Blockly.common.getSelected(), 'isDeletable')
|
|
.returns(false);
|
|
document.dispatchEvent(keyEvent);
|
|
sinon.assert.notCalled(this.copySpy);
|
|
sinon.assert.notCalled(this.hideChaffSpy);
|
|
});
|
|
});
|
|
});
|
|
// Do not copy a block if it is not movable.
|
|
suite('Block is not movable', function () {
|
|
testCases.forEach(function (testCase) {
|
|
const testCaseName = testCase[0];
|
|
const keyEvent = testCase[1];
|
|
test(testCaseName, function () {
|
|
sinon.stub(Blockly.common.getSelected(), 'isMovable').returns(false);
|
|
document.dispatchEvent(keyEvent);
|
|
sinon.assert.notCalled(this.copySpy);
|
|
sinon.assert.notCalled(this.hideChaffSpy);
|
|
});
|
|
});
|
|
});
|
|
});
|
|
|
|
suite('Undo', function () {
|
|
setup(function () {
|
|
this.undoSpy = sinon.spy(this.workspace, 'undo');
|
|
this.hideChaffSpy = sinon.spy(
|
|
Blockly.WorkspaceSvg.prototype,
|
|
'hideChaff',
|
|
);
|
|
});
|
|
const testCases = [
|
|
[
|
|
'Control Z',
|
|
createKeyDownEvent(Blockly.utils.KeyCodes.Z, [
|
|
Blockly.utils.KeyCodes.CTRL,
|
|
]),
|
|
],
|
|
[
|
|
'Meta Z',
|
|
createKeyDownEvent(Blockly.utils.KeyCodes.Z, [
|
|
Blockly.utils.KeyCodes.META,
|
|
]),
|
|
],
|
|
[
|
|
'Alt Z',
|
|
createKeyDownEvent(Blockly.utils.KeyCodes.Z, [
|
|
Blockly.utils.KeyCodes.ALT,
|
|
]),
|
|
],
|
|
];
|
|
// Undo.
|
|
suite('Simple', function () {
|
|
testCases.forEach(function (testCase) {
|
|
const testCaseName = testCase[0];
|
|
const keyEvent = testCase[1];
|
|
test(testCaseName, function () {
|
|
document.dispatchEvent(keyEvent);
|
|
sinon.assert.calledOnce(this.undoSpy);
|
|
sinon.assert.calledWith(this.undoSpy, false);
|
|
sinon.assert.calledOnce(this.hideChaffSpy);
|
|
});
|
|
});
|
|
});
|
|
// Do not undo if a gesture is in progress.
|
|
suite('Gesture in progress', function () {
|
|
testCases.forEach(function (testCase) {
|
|
const testCaseName = testCase[0];
|
|
const keyEvent = testCase[1];
|
|
test(testCaseName, function () {
|
|
sinon.stub(Blockly.Gesture, 'inProgress').returns(true);
|
|
document.dispatchEvent(keyEvent);
|
|
sinon.assert.notCalled(this.undoSpy);
|
|
sinon.assert.notCalled(this.hideChaffSpy);
|
|
});
|
|
});
|
|
});
|
|
// Do not undo if the workspace is in readOnly mode.
|
|
suite('Not called when readOnly is true', function () {
|
|
testCases.forEach(function (testCase) {
|
|
const testCaseName = testCase[0];
|
|
const keyEvent = testCase[1];
|
|
runReadOnlyTest(keyEvent, testCaseName);
|
|
});
|
|
});
|
|
});
|
|
|
|
suite('Redo', function () {
|
|
setup(function () {
|
|
this.redoSpy = sinon.spy(this.workspace, 'undo');
|
|
this.hideChaffSpy = sinon.spy(
|
|
Blockly.WorkspaceSvg.prototype,
|
|
'hideChaff',
|
|
);
|
|
});
|
|
const testCases = [
|
|
[
|
|
'Control Shift Z',
|
|
createKeyDownEvent(Blockly.utils.KeyCodes.Z, [
|
|
Blockly.utils.KeyCodes.CTRL,
|
|
Blockly.utils.KeyCodes.SHIFT,
|
|
]),
|
|
],
|
|
[
|
|
'Meta Shift Z',
|
|
createKeyDownEvent(Blockly.utils.KeyCodes.Z, [
|
|
Blockly.utils.KeyCodes.META,
|
|
Blockly.utils.KeyCodes.SHIFT,
|
|
]),
|
|
],
|
|
[
|
|
'Alt Shift Z',
|
|
createKeyDownEvent(Blockly.utils.KeyCodes.Z, [
|
|
Blockly.utils.KeyCodes.ALT,
|
|
Blockly.utils.KeyCodes.SHIFT,
|
|
]),
|
|
],
|
|
];
|
|
// Undo.
|
|
suite('Simple', function () {
|
|
testCases.forEach(function (testCase) {
|
|
const testCaseName = testCase[0];
|
|
const keyEvent = testCase[1];
|
|
test(testCaseName, function () {
|
|
document.dispatchEvent(keyEvent);
|
|
sinon.assert.calledOnce(this.redoSpy);
|
|
sinon.assert.calledWith(this.redoSpy, true);
|
|
sinon.assert.calledOnce(this.hideChaffSpy);
|
|
});
|
|
});
|
|
});
|
|
// Do not undo if a gesture is in progress.
|
|
suite('Gesture in progress', function () {
|
|
testCases.forEach(function (testCase) {
|
|
const testCaseName = testCase[0];
|
|
const keyEvent = testCase[1];
|
|
test(testCaseName, function () {
|
|
sinon.stub(Blockly.Gesture, 'inProgress').returns(true);
|
|
document.dispatchEvent(keyEvent);
|
|
sinon.assert.notCalled(this.redoSpy);
|
|
sinon.assert.notCalled(this.hideChaffSpy);
|
|
});
|
|
});
|
|
});
|
|
// Do not undo if the workspace is in readOnly mode.
|
|
suite('Not called when readOnly is true', function () {
|
|
testCases.forEach(function (testCase) {
|
|
const testCaseName = testCase[0];
|
|
const keyEvent = testCase[1];
|
|
runReadOnlyTest(keyEvent, testCaseName);
|
|
});
|
|
});
|
|
});
|
|
|
|
suite('UndoWindows', function () {
|
|
setup(function () {
|
|
this.ctrlYEvent = createKeyDownEvent(Blockly.utils.KeyCodes.Y, [
|
|
Blockly.utils.KeyCodes.CTRL,
|
|
]);
|
|
this.undoSpy = sinon.spy(this.workspace, 'undo');
|
|
this.hideChaffSpy = sinon.spy(
|
|
Blockly.WorkspaceSvg.prototype,
|
|
'hideChaff',
|
|
);
|
|
});
|
|
test('Simple', function () {
|
|
document.dispatchEvent(this.ctrlYEvent);
|
|
sinon.assert.calledOnce(this.undoSpy);
|
|
sinon.assert.calledWith(this.undoSpy, true);
|
|
sinon.assert.calledOnce(this.hideChaffSpy);
|
|
});
|
|
test('Not called when a gesture is in progress', function () {
|
|
sinon.stub(Blockly.Gesture, 'inProgress').returns(true);
|
|
document.dispatchEvent(this.ctrlYEvent);
|
|
sinon.assert.notCalled(this.undoSpy);
|
|
sinon.assert.notCalled(this.hideChaffSpy);
|
|
});
|
|
runReadOnlyTest(
|
|
createKeyDownEvent(Blockly.utils.KeyCodes.Y, [
|
|
Blockly.utils.KeyCodes.CTRL,
|
|
]),
|
|
);
|
|
});
|
|
});
|