From 155bce0f0f95c00db13de56f0aba392b44c0c9e9 Mon Sep 17 00:00:00 2001 From: Beka Westberg Date: Mon, 25 Jul 2022 20:37:48 +0000 Subject: [PATCH] chore: change goog.module to goog.declareModuleId --- tests/mocha/astnode_test.js | 2 +- tests/mocha/block_change_event_test.js | 2 +- tests/mocha/block_create_event_test.js | 2 +- tests/mocha/block_json_test.js | 2 +- tests/mocha/block_test.js | 2 +- tests/mocha/blocks/lists_test.js | 2 +- tests/mocha/blocks/logic_ternary_test.js | 2 +- tests/mocha/blocks/procedures_test.js | 2 +- tests/mocha/blocks/variables_test.js | 2 +- tests/mocha/comment_deserialization_test.js | 2 +- tests/mocha/comment_test.js | 2 +- tests/mocha/connection_checker_test.js | 2 +- tests/mocha/connection_db_test.js | 2 +- tests/mocha/connection_test.js | 2 +- tests/mocha/contextmenu_items_test.js | 2 +- tests/mocha/cursor_test.js | 2 +- tests/mocha/dropdowndiv_test.js | 2 +- tests/mocha/event_test.js | 2 +- tests/mocha/extensions_test.js | 2 +- tests/mocha/field_angle_test.js | 2 +- tests/mocha/field_checkbox_test.js | 2 +- tests/mocha/field_colour_test.js | 2 +- tests/mocha/field_dropdown_test.js | 2 +- tests/mocha/field_image_test.js | 2 +- tests/mocha/field_label_serializable_test.js | 2 +- tests/mocha/field_label_test.js | 2 +- tests/mocha/field_multilineinput_test.js | 2 +- tests/mocha/field_number_test.js | 2 +- tests/mocha/field_registry_test.js | 2 +- tests/mocha/field_test.js | 2 +- tests/mocha/field_textinput_test.js | 2 +- tests/mocha/field_variable_test.js | 2 +- tests/mocha/flyout_test.js | 2 +- tests/mocha/generator_test.js | 2 +- tests/mocha/gesture_test.js | 2 +- tests/mocha/input_test.js | 2 +- tests/mocha/insertion_marker_test.js | 2 +- tests/mocha/jso_deserialization_test.js | 2 +- tests/mocha/jso_serialization_test.js | 2 +- tests/mocha/json_test.js | 2 +- tests/mocha/keydown_test.js | 2 +- tests/mocha/metrics_test.js | 2 +- tests/mocha/mutator_test.js | 2 +- tests/mocha/names_test.js | 2 +- tests/mocha/registry_test.js | 2 +- tests/mocha/serializer_test.js | 2 +- tests/mocha/shortcut_registry_test.js | 2 +- tests/mocha/test_helpers/block_definitions.js | 2 +- tests/mocha/test_helpers/code_generation.js | 2 +- tests/mocha/test_helpers/common.js | 2 +- tests/mocha/test_helpers/events.js | 2 +- tests/mocha/test_helpers/fields.js | 2 +- tests/mocha/test_helpers/procedures.js | 2 +- tests/mocha/test_helpers/serialization.js | 2 +- tests/mocha/test_helpers/setup_teardown.js | 2 +- tests/mocha/test_helpers/toolbox_definitions.js | 2 +- tests/mocha/test_helpers/user_input.js | 2 +- tests/mocha/test_helpers/variables.js | 2 +- tests/mocha/test_helpers/warnings.js | 2 +- tests/mocha/test_helpers/workspace.js | 2 +- tests/mocha/theme_test.js | 2 +- tests/mocha/toolbox_test.js | 2 +- tests/mocha/tooltip_test.js | 2 +- tests/mocha/trashcan_test.js | 2 +- tests/mocha/utils_test.js | 2 +- tests/mocha/variable_map_test.js | 2 +- tests/mocha/variable_model_test.js | 2 +- tests/mocha/widget_div_test.js | 2 +- tests/mocha/workspace_comment_test.js | 2 +- tests/mocha/workspace_svg_test.js | 2 +- tests/mocha/workspace_test.js | 2 +- tests/mocha/xml_test.js | 2 +- tests/mocha/zoom_controls_test.js | 2 +- 73 files changed, 73 insertions(+), 73 deletions(-) diff --git a/tests/mocha/astnode_test.js b/tests/mocha/astnode_test.js index f974f3ea8..007dad709 100644 --- a/tests/mocha/astnode_test.js +++ b/tests/mocha/astnode_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.astNode'); +goog.declareModuleId('Blockly.test.astNode'); const {ASTNode} = goog.require('Blockly.ASTNode'); const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/block_change_event_test.js b/tests/mocha/block_change_event_test.js index 6cfbca578..0f9c47a1a 100644 --- a/tests/mocha/block_change_event_test.js +++ b/tests/mocha/block_change_event_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.blockChangeEvent'); +goog.declareModuleId('Blockly.test.blockChangeEvent'); const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); const {defineMutatorBlocks} = goog.require('Blockly.test.helpers.blockDefinitions'); diff --git a/tests/mocha/block_create_event_test.js b/tests/mocha/block_create_event_test.js index 475991908..bb27eb51f 100644 --- a/tests/mocha/block_create_event_test.js +++ b/tests/mocha/block_create_event_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.blockCreateEvent'); +goog.declareModuleId('Blockly.test.blockCreateEvent'); const {assertEventFired} = goog.require('Blockly.test.helpers.events'); const eventUtils = goog.require('Blockly.Events.utils'); diff --git a/tests/mocha/block_json_test.js b/tests/mocha/block_json_test.js index b93045960..ffb40aa5d 100644 --- a/tests/mocha/block_json_test.js +++ b/tests/mocha/block_json_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.blockJson'); +goog.declareModuleId('Blockly.test.blockJson'); const {Align} = goog.require('Blockly.Input'); diff --git a/tests/mocha/block_test.js b/tests/mocha/block_test.js index 13e515534..268f169c4 100644 --- a/tests/mocha/block_test.js +++ b/tests/mocha/block_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.blocks'); +goog.declareModuleId('Blockly.test.blocks'); const {Blocks} = goog.require('Blockly.blocks'); const {ConnectionType} = goog.require('Blockly.ConnectionType'); diff --git a/tests/mocha/blocks/lists_test.js b/tests/mocha/blocks/lists_test.js index 35532a89e..af11b815e 100644 --- a/tests/mocha/blocks/lists_test.js +++ b/tests/mocha/blocks/lists_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.lists'); +goog.declareModuleId('Blockly.test.lists'); const {runSerializationTestSuite} = goog.require('Blockly.test.helpers.serialization'); const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/blocks/logic_ternary_test.js b/tests/mocha/blocks/logic_ternary_test.js index 5f4c82580..e8d6b8eaf 100644 --- a/tests/mocha/blocks/logic_ternary_test.js +++ b/tests/mocha/blocks/logic_ternary_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.logicTernary'); +goog.declareModuleId('Blockly.test.logicTernary'); const eventUtils = goog.require('Blockly.Events.utils'); const {runSerializationTestSuite} = goog.require('Blockly.test.helpers.serialization'); diff --git a/tests/mocha/blocks/procedures_test.js b/tests/mocha/blocks/procedures_test.js index 6c44554e4..73a132c83 100644 --- a/tests/mocha/blocks/procedures_test.js +++ b/tests/mocha/blocks/procedures_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.procedures'); +goog.declareModuleId('Blockly.test.procedures'); goog.require('Blockly'); goog.require('Blockly.Msg'); diff --git a/tests/mocha/blocks/variables_test.js b/tests/mocha/blocks/variables_test.js index e128576d0..a00499447 100644 --- a/tests/mocha/blocks/variables_test.js +++ b/tests/mocha/blocks/variables_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.variables'); +goog.declareModuleId('Blockly.test.variables'); const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/comment_deserialization_test.js b/tests/mocha/comment_deserialization_test.js index f3eb48dc5..6605f35b1 100644 --- a/tests/mocha/comment_deserialization_test.js +++ b/tests/mocha/comment_deserialization_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.commentDeserialization'); +goog.declareModuleId('Blockly.test.commentDeserialization'); const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); const {simulateClick} = goog.require('Blockly.test.helpers.userInput'); diff --git a/tests/mocha/comment_test.js b/tests/mocha/comment_test.js index afee012f6..7efa22283 100644 --- a/tests/mocha/comment_test.js +++ b/tests/mocha/comment_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.comments'); +goog.declareModuleId('Blockly.test.comments'); const {assertEventFired} = goog.require('Blockly.test.helpers.events'); const eventUtils = goog.require('Blockly.Events.utils'); diff --git a/tests/mocha/connection_checker_test.js b/tests/mocha/connection_checker_test.js index 523fecfcc..bdfcc1acd 100644 --- a/tests/mocha/connection_checker_test.js +++ b/tests/mocha/connection_checker_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.connectionChecker'); +goog.declareModuleId('Blockly.test.connectionChecker'); const {ConnectionType} = goog.require('Blockly.ConnectionType'); const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/connection_db_test.js b/tests/mocha/connection_db_test.js index cdc343bd5..5b701cb3e 100644 --- a/tests/mocha/connection_db_test.js +++ b/tests/mocha/connection_db_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.connectionDb'); +goog.declareModuleId('Blockly.test.connectionDb'); const {ConnectionType} = goog.require('Blockly.ConnectionType'); const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/connection_test.js b/tests/mocha/connection_test.js index 37bca1240..149da4e8c 100644 --- a/tests/mocha/connection_test.js +++ b/tests/mocha/connection_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.connection'); +goog.declareModuleId('Blockly.test.connection'); const {createGenUidStubWithReturns, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); const {defineRowBlock, defineStatementBlock, defineStackBlock} = goog.require('Blockly.test.helpers.blockDefinitions'); diff --git a/tests/mocha/contextmenu_items_test.js b/tests/mocha/contextmenu_items_test.js index c9b9b8127..ea4027efc 100644 --- a/tests/mocha/contextmenu_items_test.js +++ b/tests/mocha/contextmenu_items_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.contextMenuItem'); +goog.declareModuleId('Blockly.test.contextMenuItem'); const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/cursor_test.js b/tests/mocha/cursor_test.js index 77b22470a..4938b2fe0 100644 --- a/tests/mocha/cursor_test.js +++ b/tests/mocha/cursor_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.cursor'); +goog.declareModuleId('Blockly.test.cursor'); const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); const {ASTNode} = goog.require('Blockly.ASTNode'); diff --git a/tests/mocha/dropdowndiv_test.js b/tests/mocha/dropdowndiv_test.js index 6cd8dca53..0c02c9f1a 100644 --- a/tests/mocha/dropdowndiv_test.js +++ b/tests/mocha/dropdowndiv_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.dropdown'); +goog.declareModuleId('Blockly.test.dropdown'); const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/event_test.js b/tests/mocha/event_test.js index 9ee53a689..ae08f85e5 100644 --- a/tests/mocha/event_test.js +++ b/tests/mocha/event_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.event'); +goog.declareModuleId('Blockly.test.event'); const {ASTNode} = goog.require('Blockly.ASTNode'); const {assertEventEquals, assertNthCallEventArgEquals, createFireChangeListenerSpy} = goog.require('Blockly.test.helpers.events'); diff --git a/tests/mocha/extensions_test.js b/tests/mocha/extensions_test.js index 6c2873ff1..233649cb8 100644 --- a/tests/mocha/extensions_test.js +++ b/tests/mocha/extensions_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.extensions'); +goog.declareModuleId('Blockly.test.extensions'); const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/field_angle_test.js b/tests/mocha/field_angle_test.js index d6feefbb0..d20b08c4b 100644 --- a/tests/mocha/field_angle_test.js +++ b/tests/mocha/field_angle_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.fieldAngle'); +goog.declareModuleId('Blockly.test.fieldAngle'); const {assertFieldValue, runConstructorSuiteTests, runFromJsonSuiteTests, runSetValueTests} = goog.require('Blockly.test.helpers.fields'); const {createTestBlock, defineRowBlock} = goog.require('Blockly.test.helpers.blockDefinitions'); diff --git a/tests/mocha/field_checkbox_test.js b/tests/mocha/field_checkbox_test.js index 5de565984..384b2833e 100644 --- a/tests/mocha/field_checkbox_test.js +++ b/tests/mocha/field_checkbox_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.fieldCheckbox'); +goog.declareModuleId('Blockly.test.fieldCheckbox'); const {assertFieldValue, runConstructorSuiteTests, runFromJsonSuiteTests, runSetValueTests} = goog.require('Blockly.test.helpers.fields'); const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/field_colour_test.js b/tests/mocha/field_colour_test.js index eb0389702..56d6522a6 100644 --- a/tests/mocha/field_colour_test.js +++ b/tests/mocha/field_colour_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.fieldColour'); +goog.declareModuleId('Blockly.test.fieldColour'); const {assertFieldValue, runConstructorSuiteTests, runFromJsonSuiteTests, runSetValueTests} = goog.require('Blockly.test.helpers.fields'); const {createTestBlock, defineRowBlock} = goog.require('Blockly.test.helpers.blockDefinitions'); diff --git a/tests/mocha/field_dropdown_test.js b/tests/mocha/field_dropdown_test.js index 1b67525f4..9e23f0c9e 100644 --- a/tests/mocha/field_dropdown_test.js +++ b/tests/mocha/field_dropdown_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.fieldDropdown'); +goog.declareModuleId('Blockly.test.fieldDropdown'); const {assertFieldValue, runConstructorSuiteTests, runFromJsonSuiteTests, runSetValueTests} = goog.require('Blockly.test.helpers.fields'); const {createTestBlock, defineRowBlock} = goog.require('Blockly.test.helpers.blockDefinitions'); diff --git a/tests/mocha/field_image_test.js b/tests/mocha/field_image_test.js index 62826398a..f7608c8b8 100644 --- a/tests/mocha/field_image_test.js +++ b/tests/mocha/field_image_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.fieldImage'); +goog.declareModuleId('Blockly.test.fieldImage'); const {assertFieldValue, runConstructorSuiteTests, runFromJsonSuiteTests, runSetValueTests} = goog.require('Blockly.test.helpers.fields'); const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/field_label_serializable_test.js b/tests/mocha/field_label_serializable_test.js index b5ba42824..9485f003d 100644 --- a/tests/mocha/field_label_serializable_test.js +++ b/tests/mocha/field_label_serializable_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.fieldLabelSerialization'); +goog.declareModuleId('Blockly.test.fieldLabelSerialization'); const {assertFieldValue, runConstructorSuiteTests, runFromJsonSuiteTests, runSetValueTests} = goog.require('Blockly.test.helpers.fields'); const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/field_label_test.js b/tests/mocha/field_label_test.js index 62f088b96..66a22be99 100644 --- a/tests/mocha/field_label_test.js +++ b/tests/mocha/field_label_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.fieldLabel'); +goog.declareModuleId('Blockly.test.fieldLabel'); const {assertFieldValue, runConstructorSuiteTests, runFromJsonSuiteTests, runSetValueTests} = goog.require('Blockly.test.helpers.fields'); const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/field_multilineinput_test.js b/tests/mocha/field_multilineinput_test.js index a94a1b945..81da6616a 100644 --- a/tests/mocha/field_multilineinput_test.js +++ b/tests/mocha/field_multilineinput_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.fieldMultiline'); +goog.declareModuleId('Blockly.test.fieldMultiline'); const {assertFieldValue, runConstructorSuiteTests, runFromJsonSuiteTests, runSetValueTests} = goog.require('Blockly.test.helpers.fields'); const {createTestBlock, defineRowBlock} = goog.require('Blockly.test.helpers.blockDefinitions'); diff --git a/tests/mocha/field_number_test.js b/tests/mocha/field_number_test.js index b0d002399..17c044685 100644 --- a/tests/mocha/field_number_test.js +++ b/tests/mocha/field_number_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.fieldNumber'); +goog.declareModuleId('Blockly.test.fieldNumber'); const {assertFieldValue, runConstructorSuiteTests, runFromJsonSuiteTests, runSetValueTests} = goog.require('Blockly.test.helpers.fields'); const {defineRowBlock} = goog.require('Blockly.test.helpers.blockDefinitions'); diff --git a/tests/mocha/field_registry_test.js b/tests/mocha/field_registry_test.js index 394081365..ed4040482 100644 --- a/tests/mocha/field_registry_test.js +++ b/tests/mocha/field_registry_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.fieldRegistry'); +goog.declareModuleId('Blockly.test.fieldRegistry'); const {createDeprecationWarningStub} = goog.require('Blockly.test.helpers.warnings'); const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/field_test.js b/tests/mocha/field_test.js index 4d1887aa0..0e2abc52c 100644 --- a/tests/mocha/field_test.js +++ b/tests/mocha/field_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.fieldTest'); +goog.declareModuleId('Blockly.test.fieldTest'); const {addBlockTypeToCleanup, addMessageToCleanup, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); const {createDeprecationWarningStub} = goog.require('Blockly.test.helpers.warnings'); diff --git a/tests/mocha/field_textinput_test.js b/tests/mocha/field_textinput_test.js index f46afe09b..26ced046c 100644 --- a/tests/mocha/field_textinput_test.js +++ b/tests/mocha/field_textinput_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.fieldTextInput'); +goog.declareModuleId('Blockly.test.fieldTextInput'); const {assertFieldValue, runConstructorSuiteTests, runFromJsonSuiteTests, runSetValueTests} = goog.require('Blockly.test.helpers.fields'); const {createTestBlock, defineRowBlock} = goog.require('Blockly.test.helpers.blockDefinitions'); diff --git a/tests/mocha/field_variable_test.js b/tests/mocha/field_variable_test.js index 2eafb6f42..e61c3e593 100644 --- a/tests/mocha/field_variable_test.js +++ b/tests/mocha/field_variable_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.fieldVariable'); +goog.declareModuleId('Blockly.test.fieldVariable'); const {assertFieldValue, runConstructorSuiteTests, runFromJsonSuiteTests, runSetValueTests} = goog.require('Blockly.test.helpers.fields'); const {createGenUidStubWithReturns, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/flyout_test.js b/tests/mocha/flyout_test.js index 8fbc38659..e14aae24d 100644 --- a/tests/mocha/flyout_test.js +++ b/tests/mocha/flyout_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.flyout'); +goog.declareModuleId('Blockly.test.flyout'); const {defineStackBlock, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); const {getBasicToolbox, getChildItem, getCollapsibleItem, getDeeplyNestedJSON, getInjectedToolbox, getNonCollapsibleItem, getProperSimpleJson, getSeparator, getSimpleJson, getXmlArray} = goog.require('Blockly.test.helpers.toolboxDefinitions'); diff --git a/tests/mocha/generator_test.js b/tests/mocha/generator_test.js index 3fd2fa24b..47634e55b 100644 --- a/tests/mocha/generator_test.js +++ b/tests/mocha/generator_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.generator'); +goog.declareModuleId('Blockly.test.generator'); const {dartGenerator} = goog.require('Blockly.Dart'); const {javaScriptGenerator} = goog.require('Blockly.JavaScript'); diff --git a/tests/mocha/gesture_test.js b/tests/mocha/gesture_test.js index 6e21287de..8dff04d21 100644 --- a/tests/mocha/gesture_test.js +++ b/tests/mocha/gesture_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.gesture'); +goog.declareModuleId('Blockly.test.gesture'); const {assertEventFired, assertEventNotFired} = goog.require('Blockly.test.helpers.events'); const {defineBasicBlockWithField} = goog.require('Blockly.test.helpers.blockDefinitions'); diff --git a/tests/mocha/input_test.js b/tests/mocha/input_test.js index cd6997212..d74e46c62 100644 --- a/tests/mocha/input_test.js +++ b/tests/mocha/input_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.input'); +goog.declareModuleId('Blockly.test.input'); const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/insertion_marker_test.js b/tests/mocha/insertion_marker_test.js index 909212f9e..d54e3d195 100644 --- a/tests/mocha/insertion_marker_test.js +++ b/tests/mocha/insertion_marker_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.insertionMarker'); +goog.declareModuleId('Blockly.test.insertionMarker'); const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/jso_deserialization_test.js b/tests/mocha/jso_deserialization_test.js index 7f89f1189..aeefa2205 100644 --- a/tests/mocha/jso_deserialization_test.js +++ b/tests/mocha/jso_deserialization_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.jsoDeserialization'); +goog.declareModuleId('Blockly.test.jsoDeserialization'); const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); const {assertEventFired} = goog.require('Blockly.test.helpers.events'); diff --git a/tests/mocha/jso_serialization_test.js b/tests/mocha/jso_serialization_test.js index d4abd5ffb..4a07e04d7 100644 --- a/tests/mocha/jso_serialization_test.js +++ b/tests/mocha/jso_serialization_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.jsoSerialization'); +goog.declareModuleId('Blockly.test.jsoSerialization'); const {createGenUidStubWithReturns, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); const {defineRowBlock, defineStackBlock, defineStatementBlock} = goog.require('Blockly.test.helpers.blockDefinitions'); diff --git a/tests/mocha/json_test.js b/tests/mocha/json_test.js index 3e20926cb..593a49e05 100644 --- a/tests/mocha/json_test.js +++ b/tests/mocha/json_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.json'); +goog.declareModuleId('Blockly.test.json'); const {addMessageToCleanup, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); const {assertNoWarnings, assertWarnings} = goog.require('Blockly.test.helpers.warnings'); diff --git a/tests/mocha/keydown_test.js b/tests/mocha/keydown_test.js index a5e695448..f8165577c 100644 --- a/tests/mocha/keydown_test.js +++ b/tests/mocha/keydown_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.keydown'); +goog.declareModuleId('Blockly.test.keydown'); const {createKeyDownEvent} = goog.require('Blockly.test.helpers.userInput'); const {defineStackBlock} = goog.require('Blockly.test.helpers.blockDefinitions'); diff --git a/tests/mocha/metrics_test.js b/tests/mocha/metrics_test.js index 5fcc0b69c..c66b5f5d3 100644 --- a/tests/mocha/metrics_test.js +++ b/tests/mocha/metrics_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.metrics'); +goog.declareModuleId('Blockly.test.metrics'); const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/mutator_test.js b/tests/mocha/mutator_test.js index f08d9879c..65b35c7f3 100644 --- a/tests/mocha/mutator_test.js +++ b/tests/mocha/mutator_test.js @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.mutator'); +goog.declareModuleId('Blockly.test.mutator'); const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); const {createRenderedBlock, defineMutatorBlocks} = goog.require('Blockly.test.helpers.blockDefinitions'); diff --git a/tests/mocha/names_test.js b/tests/mocha/names_test.js index 705a3ff9b..c7d5a9166 100644 --- a/tests/mocha/names_test.js +++ b/tests/mocha/names_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.names'); +goog.declareModuleId('Blockly.test.names'); const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/registry_test.js b/tests/mocha/registry_test.js index b6fabfea1..17fcf09ac 100644 --- a/tests/mocha/registry_test.js +++ b/tests/mocha/registry_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.registry'); +goog.declareModuleId('Blockly.test.registry'); const {assertWarnings} = goog.require('Blockly.test.helpers.warnings'); const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/serializer_test.js b/tests/mocha/serializer_test.js index 9ddb4a90e..eebde06b3 100644 --- a/tests/mocha/serializer_test.js +++ b/tests/mocha/serializer_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.serialization'); +goog.declareModuleId('Blockly.test.serialization'); const {TestCase, TestSuite, runTestCases, runTestSuites} = goog.require('Blockly.test.helpers.common'); const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/shortcut_registry_test.js b/tests/mocha/shortcut_registry_test.js index 8d38ebff9..eb473ab87 100644 --- a/tests/mocha/shortcut_registry_test.js +++ b/tests/mocha/shortcut_registry_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.shortcutRegistry'); +goog.declareModuleId('Blockly.test.shortcutRegistry'); const {createKeyDownEvent} = goog.require('Blockly.test.helpers.userInput'); const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/test_helpers/block_definitions.js b/tests/mocha/test_helpers/block_definitions.js index a30d7defe..3845619b9 100644 --- a/tests/mocha/test_helpers/block_definitions.js +++ b/tests/mocha/test_helpers/block_definitions.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.helpers.blockDefinitions'); +goog.declareModuleId('Blockly.test.helpers.blockDefinitions'); function defineStackBlock(name = 'stack_block') { diff --git a/tests/mocha/test_helpers/code_generation.js b/tests/mocha/test_helpers/code_generation.js index 72d520c7f..cdf1763b0 100644 --- a/tests/mocha/test_helpers/code_generation.js +++ b/tests/mocha/test_helpers/code_generation.js @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.helpers.codeGeneration'); +goog.declareModuleId('Blockly.test.helpers.codeGeneration'); const {runTestSuites} = goog.require('Blockly.test.helpers.common'); diff --git a/tests/mocha/test_helpers/common.js b/tests/mocha/test_helpers/common.js index fcb61021a..395cc6798 100644 --- a/tests/mocha/test_helpers/common.js +++ b/tests/mocha/test_helpers/common.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.helpers.common'); +goog.declareModuleId('Blockly.test.helpers.common'); /** * Test case configuration. diff --git a/tests/mocha/test_helpers/events.js b/tests/mocha/test_helpers/events.js index e69573318..220313e28 100644 --- a/tests/mocha/test_helpers/events.js +++ b/tests/mocha/test_helpers/events.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.helpers.events'); +goog.declareModuleId('Blockly.test.helpers.events'); /** diff --git a/tests/mocha/test_helpers/fields.js b/tests/mocha/test_helpers/fields.js index dd89e55fa..fa0892786 100644 --- a/tests/mocha/test_helpers/fields.js +++ b/tests/mocha/test_helpers/fields.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.helpers.fields'); +goog.declareModuleId('Blockly.test.helpers.fields'); const {runTestCases, TestCase} = goog.require('Blockly.test.helpers.common'); diff --git a/tests/mocha/test_helpers/procedures.js b/tests/mocha/test_helpers/procedures.js index 23843c9f6..d7dab4427 100644 --- a/tests/mocha/test_helpers/procedures.js +++ b/tests/mocha/test_helpers/procedures.js @@ -3,7 +3,7 @@ * Copyright 2020 Google LLC * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.helpers.procedures'); +goog.declareModuleId('Blockly.test.helpers.procedures'); const {ConnectionType} = goog.require('Blockly.ConnectionType'); diff --git a/tests/mocha/test_helpers/serialization.js b/tests/mocha/test_helpers/serialization.js index c8b90ba7f..cc0023d78 100644 --- a/tests/mocha/test_helpers/serialization.js +++ b/tests/mocha/test_helpers/serialization.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.helpers.serialization'); +goog.declareModuleId('Blockly.test.helpers.serialization'); const {runTestCases} = goog.require('Blockly.test.helpers.common'); diff --git a/tests/mocha/test_helpers/setup_teardown.js b/tests/mocha/test_helpers/setup_teardown.js index e1b085be1..51f582769 100644 --- a/tests/mocha/test_helpers/setup_teardown.js +++ b/tests/mocha/test_helpers/setup_teardown.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.helpers.setupTeardown'); +goog.declareModuleId('Blockly.test.helpers.setupTeardown'); const eventUtils = goog.require('Blockly.Events.utils'); const {Blocks} = goog.require('Blockly.blocks'); diff --git a/tests/mocha/test_helpers/toolbox_definitions.js b/tests/mocha/test_helpers/toolbox_definitions.js index ee7ff576f..900a90b6a 100644 --- a/tests/mocha/test_helpers/toolbox_definitions.js +++ b/tests/mocha/test_helpers/toolbox_definitions.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.helpers.toolboxDefinitions'); +goog.declareModuleId('Blockly.test.helpers.toolboxDefinitions'); /** diff --git a/tests/mocha/test_helpers/user_input.js b/tests/mocha/test_helpers/user_input.js index 9482a7909..3cb3409dc 100644 --- a/tests/mocha/test_helpers/user_input.js +++ b/tests/mocha/test_helpers/user_input.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.helpers.userInput'); +goog.declareModuleId('Blockly.test.helpers.userInput'); const {KeyCodes} = goog.require('Blockly.utils.KeyCodes'); diff --git a/tests/mocha/test_helpers/variables.js b/tests/mocha/test_helpers/variables.js index f550e960b..3eb81c1c2 100644 --- a/tests/mocha/test_helpers/variables.js +++ b/tests/mocha/test_helpers/variables.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.helpers.variables'); +goog.declareModuleId('Blockly.test.helpers.variables'); /** diff --git a/tests/mocha/test_helpers/warnings.js b/tests/mocha/test_helpers/warnings.js index 0457395cc..a49c1b661 100644 --- a/tests/mocha/test_helpers/warnings.js +++ b/tests/mocha/test_helpers/warnings.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.helpers.warnings'); +goog.declareModuleId('Blockly.test.helpers.warnings'); /** diff --git a/tests/mocha/test_helpers/workspace.js b/tests/mocha/test_helpers/workspace.js index 204a46df6..fb7f263b4 100644 --- a/tests/mocha/test_helpers/workspace.js +++ b/tests/mocha/test_helpers/workspace.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.helpers.workspace'); +goog.declareModuleId('Blockly.test.helpers.workspace'); const {assertVariableValues} = goog.require('Blockly.test.helpers.variables'); const {assertWarnings} = goog.require('Blockly.test.helpers.warnings'); diff --git a/tests/mocha/theme_test.js b/tests/mocha/theme_test.js index cc29797f1..d12233e4b 100644 --- a/tests/mocha/theme_test.js +++ b/tests/mocha/theme_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.theme'); +goog.declareModuleId('Blockly.test.theme'); const {assertEventFired} = goog.require('Blockly.test.helpers.events'); const eventUtils = goog.require('Blockly.Events.utils'); diff --git a/tests/mocha/toolbox_test.js b/tests/mocha/toolbox_test.js index 65acef5b4..93ea3ab1b 100644 --- a/tests/mocha/toolbox_test.js +++ b/tests/mocha/toolbox_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.toolbox'); +goog.declareModuleId('Blockly.test.toolbox'); const {defineStackBlock} = goog.require('Blockly.test.helpers.blockDefinitions'); const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/tooltip_test.js b/tests/mocha/tooltip_test.js index 5483ea390..187bfe004 100644 --- a/tests/mocha/tooltip_test.js +++ b/tests/mocha/tooltip_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.tooltip'); +goog.declareModuleId('Blockly.test.tooltip'); const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/trashcan_test.js b/tests/mocha/trashcan_test.js index c57d6cb6f..890c0f7e9 100644 --- a/tests/mocha/trashcan_test.js +++ b/tests/mocha/trashcan_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.trashcan'); +goog.declareModuleId('Blockly.test.trashcan'); const {assertEventFired, assertEventNotFired} = goog.require('Blockly.test.helpers.events'); const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/utils_test.js b/tests/mocha/utils_test.js index b21d45465..587e91b99 100644 --- a/tests/mocha/utils_test.js +++ b/tests/mocha/utils_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.utils'); +goog.declareModuleId('Blockly.test.utils'); const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/variable_map_test.js b/tests/mocha/variable_map_test.js index 14bc0168e..91804a7f5 100644 --- a/tests/mocha/variable_map_test.js +++ b/tests/mocha/variable_map_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.variableMap'); +goog.declareModuleId('Blockly.test.variableMap'); const {assertVariableValues} = goog.require('Blockly.test.helpers.variables'); const {createGenUidStubWithReturns, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/variable_model_test.js b/tests/mocha/variable_model_test.js index 08a134642..a0517e3a9 100644 --- a/tests/mocha/variable_model_test.js +++ b/tests/mocha/variable_model_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.variableModel'); +goog.declareModuleId('Blockly.test.variableModel'); const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/widget_div_test.js b/tests/mocha/widget_div_test.js index dade02878..32a44539e 100644 --- a/tests/mocha/widget_div_test.js +++ b/tests/mocha/widget_div_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.widgetDiv'); +goog.declareModuleId('Blockly.test.widgetDiv'); const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/workspace_comment_test.js b/tests/mocha/workspace_comment_test.js index 233e42e39..80ae8b47a 100644 --- a/tests/mocha/workspace_comment_test.js +++ b/tests/mocha/workspace_comment_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.workspaceComment'); +goog.declareModuleId('Blockly.test.workspaceComment'); goog.require('Blockly.WorkspaceComment'); const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/workspace_svg_test.js b/tests/mocha/workspace_svg_test.js index f5fe4cd70..c6fbbe953 100644 --- a/tests/mocha/workspace_svg_test.js +++ b/tests/mocha/workspace_svg_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.workspaceSvg'); +goog.declareModuleId('Blockly.test.workspaceSvg'); const {assertEventFired, assertEventNotFired, createFireChangeListenerSpy} = goog.require('Blockly.test.helpers.events'); const {assertVariableValues} = goog.require('Blockly.test.helpers.variables'); diff --git a/tests/mocha/workspace_test.js b/tests/mocha/workspace_test.js index 8153518b0..d19806775 100644 --- a/tests/mocha/workspace_test.js +++ b/tests/mocha/workspace_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.workspace'); +goog.declareModuleId('Blockly.test.workspace'); const {assertVariableValues} = goog.require('Blockly.test.helpers.variables'); const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); diff --git a/tests/mocha/xml_test.js b/tests/mocha/xml_test.js index 78ddeeeef..6c9ee2629 100644 --- a/tests/mocha/xml_test.js +++ b/tests/mocha/xml_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.xml'); +goog.declareModuleId('Blockly.test.xml'); const {addBlockTypeToCleanup, createGenUidStubWithReturns, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); const {assertVariableValues} = goog.require('Blockly.test.helpers.variables'); diff --git a/tests/mocha/zoom_controls_test.js b/tests/mocha/zoom_controls_test.js index 573e8b8ff..c45c07d9d 100644 --- a/tests/mocha/zoom_controls_test.js +++ b/tests/mocha/zoom_controls_test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -goog.module('Blockly.test.zoomControls'); +goog.declareModuleId('Blockly.test.zoomControls'); const {assertEventFired, assertEventNotFired} = goog.require('Blockly.test.helpers.events'); const eventUtils = goog.require('Blockly.Events.utils');