CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-07 17:10:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Migrate selected from Blockly to Blockly.common (#5489)

Browse Source 
* Add getSelected/setSelected to core/common.js

* Migrate core to use Blockly.common.getSelected/setSelected instead of Blockly.selected

* Migrate demos to use Blockly.common.getSelected/setSelected instead of Blockly.selected

* Remove Blockly.selected

* Use variable instead of calling common.getSelected() multiple times

* Add accessor for selected on Blockly

* Add renaming record for Blockly.selected -> Blockly.common.getSelected/setSelected
This commit is contained in:
Aaron Dodson
2021-09-17 11:42:43 -07:00
committed by GitHub
parent dbf10cf167
commit 7aab18409f
17 changed files with 117 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/mocha/keydown_test.js
View File

@@ -24,7 +24,7 @@ suite('Key Down', function() {
*/
function setSelectedBlock(workspace) {
defineStackBlock();
Blockly.selected = workspace.newBlock('stack_block');
Blockly.common.setSelected(workspace.newBlock('stack_block'));
}
/**
@@ -70,7 +70,7 @@ suite('Key Down', function() {
this.hideChaffSpy = sinon.spy(
Blockly.WorkspaceSvg.prototype, 'hideChaff');
setSelectedBlock(this.workspace);
this.deleteSpy = sinon.spy(Blockly.selected, 'dispose');
this.deleteSpy = sinon.spy(Blockly.common.getSelected(), 'dispose');
});
var testCases = [
['Delete', createKeyDownEvent(Blockly.utils.KeyCodes.DELETE)],
@@ -149,7 +149,7 @@ suite('Key Down', function() {
var testCaseName = testCase[0];
var keyEvent = testCase[1];
test(testCaseName, function() {
sinon.stub(Blockly.selected, 'isDeletable').returns(false);
sinon.stub(Blockly.common.getSelected(), 'isDeletable').returns(false);
document.dispatchEvent(keyEvent);
sinon.assert.notCalled(this.copySpy);
sinon.assert.notCalled(this.hideChaffSpy);
@@ -162,7 +162,7 @@ suite('Key Down', function() {
var testCaseName = testCase[0];
var keyEvent = testCase[1];
test(testCaseName, function() {
sinon.stub(Blockly.selected, 'isMovable').returns(false);
sinon.stub(Blockly.common.getSelected(), 'isMovable').returns(false);
document.dispatchEvent(keyEvent);
sinon.assert.notCalled(this.copySpy);
sinon.assert.notCalled(this.hideChaffSpy);

1
tests/mocha/run_mocha_tests_in_browser.js
View File

@@ -66,7 +66,6 @@ async function runMochaTestsInBrowser() {
console.log(numOfFailure + ' tests failed');
console.log('============Blockly Mocha Test Summary=================');
if (parseInt(numOfFailure) !== 0) {
await browser.deleteSession();
return 1;
}
await browser.deleteSession();