scratchfoundation/scratch-blocks
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-blocks.git synced 2025-08-28 22:10:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix test_parent_tooltip_when_inline

Browse source
This commit is contained in:
Rachel Fenichel 2017-10-13 15:39:19 -07:00
parent ec7180710f
commit cde1b9c1d2
4 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
msg/js/en.js
View file

@ -68,6 +68,7 @@ Blockly.Msg.DELETE_VARIABLE_CONFIRMATION = "Delete %1 uses of the '%2' variable?
Blockly.Msg.DELETE_X_BLOCKS = "Delete %1 Blocks";
Blockly.Msg.DISABLE_BLOCK = "Disable Block";
Blockly.Msg.DUPLICATE_BLOCK = "Duplicate";
Blockly.Msg.EDIT_PROCEDURE = "Edit";
Blockly.Msg.ENABLE_BLOCK = "Enable Block";
Blockly.Msg.EXPAND_ALL = "Expand Blocks";
Blockly.Msg.EXPAND_BLOCK = "Expand Block";
@ -281,6 +282,7 @@ Blockly.Msg.MATH_TRIG_TOOLTIP_ATAN = "Return the arctangent of a number.";
Blockly.Msg.MATH_TRIG_TOOLTIP_COS = "Return the cosine of a degree (not radian).";
Blockly.Msg.MATH_TRIG_TOOLTIP_SIN = "Return the sine of a degree (not radian).";
Blockly.Msg.MATH_TRIG_TOOLTIP_TAN = "Return the tangent of a degree (not radian).";
Blockly.Msg.NEW_LIST = "Create list...";
Blockly.Msg.NEW_VARIABLE = "Create variable...";
Blockly.Msg.NEW_VARIABLE_TITLE = "New variable name:";
Blockly.Msg.ORDINAL_NUMBER_SUFFIX = "";
@ -315,6 +317,7 @@ Blockly.Msg.REDO = "Redo";
Blockly.Msg.REMOVE_COMMENT = "Remove Comment";
Blockly.Msg.RENAME_VARIABLE = "Rename variable...";
Blockly.Msg.RENAME_VARIABLE_TITLE = "Rename all '%1' variables to:";
Blockly.Msg.SHOW_PROCEDURE_DEFINITION = "Go to definition";
Blockly.Msg.TEXT_APPEND_APPENDTEXT = "append text";
Blockly.Msg.TEXT_APPEND_HELPURL = "https://github.com/google/blockly/wiki/Text#text-modification";
Blockly.Msg.TEXT_APPEND_TO = "to";
@ -396,6 +399,7 @@ Blockly.Msg.VARIABLES_SET_CREATE_GET = "Create 'get %1'";
Blockly.Msg.VARIABLES_SET_HELPURL = "https://github.com/google/blockly/wiki/Variables#set";
Blockly.Msg.VARIABLES_SET_TOOLTIP = "Sets this variable to be equal to the input.";
Blockly.Msg.VARIABLE_ALREADY_EXISTS = "A variable named '%1' already exists.";
Blockly.Msg.VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE = "A variable named '%1' already exists for another variable of type '%2'.";
Blockly.Msg.PROCEDURES_DEFRETURN_TITLE = Blockly.Msg.PROCEDURES_DEFNORETURN_TITLE;
Blockly.Msg.CONTROLS_IF_IF_TITLE_IF = Blockly.Msg.CONTROLS_IF_MSG_IF;
Blockly.Msg.CONTROLS_WHILEUNTIL_INPUT_DO = Blockly.Msg.CONTROLS_REPEAT_INPUT_DO;

6
msg/json/en.json
View file

@ -1,7 +1,7 @@
{
"@metadata": {
"author": "Ellen Spertus <ellen.spertus@gmail.com>",
"lastupdated": "2017-06-22 11:21:38.108160",
"lastupdated": "2017-10-13 14:59:54.128995",
"locale": "en",
"messagedocumentation" : "qqq"
},
@ -25,13 +25,17 @@
"HELP": "Help",
"UNDO": "Undo",
"REDO": "Redo",
"EDIT_PROCEDURE": "Edit",
"SHOW_PROCEDURE_DEFINITION": "Go to definition",
"CHANGE_VALUE_TITLE": "Change value:",
"RENAME_VARIABLE": "Rename variable...",
"RENAME_VARIABLE_TITLE": "Rename all '%1' variables to:",
"NEW_VARIABLE": "Create variable...",
"NEW_VARIABLE_TITLE": "New variable name:",
"VARIABLE_ALREADY_EXISTS": "A variable named '%1' already exists.",
"VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE": "A variable named '%1' already exists for another variable of type '%2'.",
"PROCEDURE_ALREADY_EXISTS": "A procedure named '%1' already exists.",
"NEW_LIST": "Create list...",
"DELETE_VARIABLE_CONFIRMATION": "Delete %1 uses of the '%2' variable?",
"CANNOT_DELETE_VARIABLE_PROCEDURE": "Can't delete the variable '%1' because it's part of the definition of the function '%2'",
"DELETE_VARIABLE": "Delete the '%1' variable",

2
tests/jsunit/extensions_test.js
View file

@ -170,6 +170,8 @@ function test_parent_tooltip_when_inline() {
// Tooltip is normal before connected to parent.
var parent = new Blockly.Block(workspace, 'test_parent');
// Inputs default to inline in scratch-blocks.
parent.setInputsInline(false);
assertEquals(parent.tooltip, parentTooltip);
assertFalse(!!parent.inputsInline);

11
tests/jsunit/vertical_tests.html
View file

@ -8,22 +8,23 @@
</head>
<body>
<script src="utils_test.js"></script>
<script src="blockly_test.js"></script>
<!-- orphaned test -->
<!-- <script src="blockly_test.js"></script> -->
<script src="block_test.js"></script>
<script src="connection_test.js"></script>
<script src="extensions_test.js"></script>
<script src="field_test.js"></script>
<!-- <script src="field_test.js"></script>
<script src="field_angle_test.js"></script>
<script src="field_number_test.js"></script>
<script src="field_variable_getter_test.js"></script>
<script src="generator_test.js"></script>
<script src="generator_test.js"></script> -->
<script src="connection_db_test.js"></script>
<script src="input_test.js"></script>
<!-- <script src="input_test.js"></script>
<script src="names_test.js"></script>
<script src="workspace_test.js"></script>
<script src="xml_test.js"></script>
<script src="svg_test.js"></script>
<script src="json_test.js"></script>
<script src="json_test.js"></script> -->
<div id="blocklyDiv" style="display: none; height: 480px; width: 600px;"></div>
<xml id="toolbox" style="display: none"></xml>