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

Separate tests

Browse Source
This commit is contained in:
Rachel Fenichel
2017-02-06 15:25:59 -08:00
parent 630863d9db
commit 5a40208138
2 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/field.js
View File

@@ -201,7 +201,7 @@ Blockly.Field.prototype.updateEditable = function() {
* non-editable blocks.
* @return {boolean} whether this field is editable and on an editable block
*/
Blockly.Field.prototype.isEditable = function() {
Blockly.Field.prototype.isCurrentlyEditable = function() {
return this.EDITABLE && !!this.sourceBlock_ && this.sourceBlock_.isEditable();
};

50
tests/jsunit/field_test.js
View File

@@ -24,54 +24,76 @@
*/
'use strict';
function test_field_iseditable() {
function test_field_isEditable_simple() {
var field = new Blockly.Field("Dummy text");
// EDITABLE is true by default, but without a source block a field can't be
// edited.
assertFalse('Field without a block is not editable', field.isEditable());
assertFalse('Field without a block is not editable',
field.isCurrentlyEditable());
}
function test_field_isEditable_false() {
// Setting EDITABLE to false doesn't matter.
field = new Blockly.Field("Dummy text");
var field = new Blockly.Field("Dummy text");
field.EDITABLE = false;
assertFalse('Field without a block is not editable', field.isEditable());
assertFalse('Field without a block is not editable',
field.isCurrentlyEditable());
}
// Tests with an editable source block.
function test_field_isEditable_editableBlock() {
var editableBlock = {
isEditable: function() {
return true;
}
};
field = new Blockly.Field("Dummy text");
var field = new Blockly.Field("Dummy text");
field.sourceBlock_ = editableBlock;
assertTrue('Editable field with editable block is editable',
field.isEditable());
field.isCurrentlyEditable());
}
field = new Blockly.Field("Dummy text");
function test_field_isEditable_editableBlock_false() {
var editableBlock = {
isEditable: function() {
return true;
}
};
var field = new Blockly.Field("Dummy text");
field.sourceBlock_ = editableBlock;
field.EDITABLE = false;
assertFalse('Non-editable field with editable block is not editable',
field.isEditable());
field.isCurrentlyEditable());
}
// Tests with a non-editable source block.
function test_field_isEditable_nonEditableBlock() {
var nonEditableBlock = {
isEditable: function() {
return false;
}
};
field = new Blockly.Field("Dummy text");
var field = new Blockly.Field("Dummy text");
field.sourceBlock_ = nonEditableBlock;
assertFalse('Editable field with non-editable block is not editable',
field.isEditable());
field.isCurrentlyEditable());
}
field = new Blockly.Field("Dummy text");
function test_field_isEditable_nonEditableBlock_false() {
var nonEditableBlock = {
isEditable: function() {
return false;
}
};
var field = new Blockly.Field("Dummy text");
field.sourceBlock_ = nonEditableBlock;
field.EDITABLE = false;
assertFalse('Non-editable field with non-editable block is not editable',
field.isEditable());
field.isCurrentlyEditable());
}