From 3e50e1ba149e27245dd2cca9efb2fe58979b0027 Mon Sep 17 00:00:00 2001 From: Beka Westberg Date: Mon, 25 Jul 2022 22:24:05 +0000 Subject: [PATCH] chore: convert imports of test helpers to esmodule imports --- tests/mocha/astnode_test.js | 2 +- tests/mocha/block_change_event_test.js | 4 ++-- tests/mocha/block_create_event_test.js | 4 ++-- tests/mocha/block_test.js | 6 +++--- tests/mocha/blocks/lists_test.js | 4 ++-- tests/mocha/blocks/logic_ternary_test.js | 2 +- tests/mocha/blocks/procedures_test.js | 4 ++-- tests/mocha/blocks/variables_test.js | 2 +- tests/mocha/comment_deserialization_test.js | 4 ++-- tests/mocha/comment_test.js | 4 ++-- tests/mocha/connection_checker_test.js | 2 +- tests/mocha/connection_db_test.js | 2 +- tests/mocha/connection_test.js | 4 ++-- tests/mocha/contextmenu_items_test.js | 2 +- tests/mocha/cursor_test.js | 2 +- tests/mocha/dropdowndiv_test.js | 2 +- tests/mocha/event_test.js | 6 +++--- tests/mocha/extensions_test.js | 2 +- tests/mocha/field_angle_test.js | 6 +++--- tests/mocha/field_checkbox_test.js | 6 +++--- tests/mocha/field_colour_test.js | 6 +++--- tests/mocha/field_dropdown_test.js | 6 +++--- tests/mocha/field_image_test.js | 4 ++-- tests/mocha/field_label_serializable_test.js | 6 +++--- tests/mocha/field_label_test.js | 6 +++--- tests/mocha/field_multilineinput_test.js | 8 ++++---- tests/mocha/field_number_test.js | 8 ++++---- tests/mocha/field_registry_test.js | 4 ++-- tests/mocha/field_test.js | 4 ++-- tests/mocha/field_textinput_test.js | 6 +++--- tests/mocha/field_variable_test.js | 6 +++--- tests/mocha/flyout_test.js | 4 ++-- tests/mocha/generator_test.js | 2 +- tests/mocha/gesture_test.js | 8 ++++---- tests/mocha/input_test.js | 2 +- tests/mocha/insertion_marker_test.js | 2 +- tests/mocha/jso_deserialization_test.js | 4 ++-- tests/mocha/jso_serialization_test.js | 4 ++-- tests/mocha/json_test.js | 4 ++-- tests/mocha/keydown_test.js | 6 +++--- tests/mocha/metrics_test.js | 2 +- tests/mocha/mutator_test.js | 4 ++-- tests/mocha/names_test.js | 2 +- tests/mocha/registry_test.js | 4 ++-- tests/mocha/serializer_test.js | 4 ++-- tests/mocha/shortcut_registry_test.js | 4 ++-- tests/mocha/theme_test.js | 4 ++-- tests/mocha/toolbox_test.js | 6 +++--- tests/mocha/tooltip_test.js | 2 +- tests/mocha/trashcan_test.js | 8 ++++---- tests/mocha/utils_test.js | 2 +- tests/mocha/variable_map_test.js | 4 ++-- 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 | 10 +++++----- tests/mocha/workspace_test.js | 6 +++--- tests/mocha/xml_test.js | 4 ++-- tests/mocha/zoom_controls_test.js | 6 +++--- 59 files changed, 124 insertions(+), 124 deletions(-) diff --git a/tests/mocha/astnode_test.js b/tests/mocha/astnode_test.js index 007dad709..09e38dcb2 100644 --- a/tests/mocha/astnode_test.js +++ b/tests/mocha/astnode_test.js @@ -7,7 +7,7 @@ goog.declareModuleId('Blockly.test.astNode'); const {ASTNode} = goog.require('Blockly.ASTNode'); -const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js'; suite('ASTNode', function() { diff --git a/tests/mocha/block_change_event_test.js b/tests/mocha/block_change_event_test.js index 0f9c47a1a..ecd62f4b4 100644 --- a/tests/mocha/block_change_event_test.js +++ b/tests/mocha/block_change_event_test.js @@ -6,8 +6,8 @@ goog.declareModuleId('Blockly.test.blockChangeEvent'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); -const {defineMutatorBlocks} = goog.require('Blockly.test.helpers.blockDefinitions'); +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; +import {defineMutatorBlocks} from './test_helpers/block_definitions.js'; suite('Block Change Event', function() { diff --git a/tests/mocha/block_create_event_test.js b/tests/mocha/block_create_event_test.js index bb27eb51f..c75d8c461 100644 --- a/tests/mocha/block_create_event_test.js +++ b/tests/mocha/block_create_event_test.js @@ -6,9 +6,9 @@ goog.declareModuleId('Blockly.test.blockCreateEvent'); -const {assertEventFired} = goog.require('Blockly.test.helpers.events'); +import {assertEventFired} from './test_helpers/events.js'; const eventUtils = goog.require('Blockly.Events.utils'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; suite('Block Create Event', function() { diff --git a/tests/mocha/block_test.js b/tests/mocha/block_test.js index 268f169c4..b31d9b18f 100644 --- a/tests/mocha/block_test.js +++ b/tests/mocha/block_test.js @@ -8,10 +8,10 @@ goog.declareModuleId('Blockly.test.blocks'); const {Blocks} = goog.require('Blockly.blocks'); const {ConnectionType} = goog.require('Blockly.ConnectionType'); -const {createDeprecationWarningStub} = goog.require('Blockly.test.helpers.warnings'); -const {createRenderedBlock} = goog.require('Blockly.test.helpers.blockDefinitions'); +import {createDeprecationWarningStub} from './test_helpers/warnings.js'; +import {createRenderedBlock} from './test_helpers/block_definitions.js'; const eventUtils = goog.require('Blockly.Events.utils'); -const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js'; suite('Blocks', function() { diff --git a/tests/mocha/blocks/lists_test.js b/tests/mocha/blocks/lists_test.js index af11b815e..eb7846a3c 100644 --- a/tests/mocha/blocks/lists_test.js +++ b/tests/mocha/blocks/lists_test.js @@ -7,9 +7,9 @@ goog.declareModuleId('Blockly.test.lists'); const {runSerializationTestSuite} = goog.require('Blockly.test.helpers.serialization'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; const {ConnectionType} = goog.require('Blockly.ConnectionType'); -const {defineStatementBlock} = goog.require('Blockly.test.helpers.blockDefinitions'); +import {defineStatementBlock} from './test_helpers/block_definitions.js'; suite('Lists', function() { diff --git a/tests/mocha/blocks/logic_ternary_test.js b/tests/mocha/blocks/logic_ternary_test.js index e8d6b8eaf..f8cb07d4a 100644 --- a/tests/mocha/blocks/logic_ternary_test.js +++ b/tests/mocha/blocks/logic_ternary_test.js @@ -8,7 +8,7 @@ goog.declareModuleId('Blockly.test.logicTernary'); const eventUtils = goog.require('Blockly.Events.utils'); const {runSerializationTestSuite} = goog.require('Blockly.test.helpers.serialization'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; suite('Logic ternary', function() { diff --git a/tests/mocha/blocks/procedures_test.js b/tests/mocha/blocks/procedures_test.js index 73a132c83..7ffe75e89 100644 --- a/tests/mocha/blocks/procedures_test.js +++ b/tests/mocha/blocks/procedures_test.js @@ -8,9 +8,9 @@ goog.declareModuleId('Blockly.test.procedures'); goog.require('Blockly'); goog.require('Blockly.Msg'); -const {assertCallBlockStructure, assertDefBlockStructure, createProcDefBlock, createProcCallBlock} = goog.require('Blockly.test.helpers.procedures'); +import {assertCallBlockStructure, assertDefBlockStructure, createProcDefBlock, createProcCallBlock} from './test_helpers/procedures.js'; const {runSerializationTestSuite} = goog.require('Blockly.test.helpers.serialization'); -const {createGenUidStubWithReturns, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {createGenUidStubWithReturns, sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js'; suite('Procedures', function() { diff --git a/tests/mocha/blocks/variables_test.js b/tests/mocha/blocks/variables_test.js index a00499447..6f0fca05a 100644 --- a/tests/mocha/blocks/variables_test.js +++ b/tests/mocha/blocks/variables_test.js @@ -6,7 +6,7 @@ goog.declareModuleId('Blockly.test.variables'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; suite('Variables', function() { diff --git a/tests/mocha/comment_deserialization_test.js b/tests/mocha/comment_deserialization_test.js index 6605f35b1..a37e98986 100644 --- a/tests/mocha/comment_deserialization_test.js +++ b/tests/mocha/comment_deserialization_test.js @@ -6,8 +6,8 @@ goog.declareModuleId('Blockly.test.commentDeserialization'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); -const {simulateClick} = goog.require('Blockly.test.helpers.userInput'); +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; +import {simulateClick} from './test_helpers/user_input.js'; suite('Comment Deserialization', function() { diff --git a/tests/mocha/comment_test.js b/tests/mocha/comment_test.js index 7efa22283..c3db5badc 100644 --- a/tests/mocha/comment_test.js +++ b/tests/mocha/comment_test.js @@ -6,9 +6,9 @@ goog.declareModuleId('Blockly.test.comments'); -const {assertEventFired} = goog.require('Blockly.test.helpers.events'); +import {assertEventFired} from './test_helpers/events.js'; const eventUtils = goog.require('Blockly.Events.utils'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; suite('Comments', function() { diff --git a/tests/mocha/connection_checker_test.js b/tests/mocha/connection_checker_test.js index bdfcc1acd..a02268837 100644 --- a/tests/mocha/connection_checker_test.js +++ b/tests/mocha/connection_checker_test.js @@ -7,7 +7,7 @@ goog.declareModuleId('Blockly.test.connectionChecker'); const {ConnectionType} = goog.require('Blockly.ConnectionType'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; suite('Connection checker', function() { diff --git a/tests/mocha/connection_db_test.js b/tests/mocha/connection_db_test.js index 5b701cb3e..484884181 100644 --- a/tests/mocha/connection_db_test.js +++ b/tests/mocha/connection_db_test.js @@ -7,7 +7,7 @@ goog.declareModuleId('Blockly.test.connectionDb'); const {ConnectionType} = goog.require('Blockly.ConnectionType'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; suite('Connection Database', function() { diff --git a/tests/mocha/connection_test.js b/tests/mocha/connection_test.js index 149da4e8c..878fcd006 100644 --- a/tests/mocha/connection_test.js +++ b/tests/mocha/connection_test.js @@ -6,8 +6,8 @@ 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'); +import {createGenUidStubWithReturns, sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js'; +import {defineRowBlock, defineStatementBlock, defineStackBlock} from './test_helpers/block_definitions.js'; suite('Connection', function() { diff --git a/tests/mocha/contextmenu_items_test.js b/tests/mocha/contextmenu_items_test.js index ea4027efc..92fe22cd0 100644 --- a/tests/mocha/contextmenu_items_test.js +++ b/tests/mocha/contextmenu_items_test.js @@ -6,7 +6,7 @@ goog.declareModuleId('Blockly.test.contextMenuItem'); -const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js'; suite('Context Menu Items', function() { diff --git a/tests/mocha/cursor_test.js b/tests/mocha/cursor_test.js index 4938b2fe0..bdd712521 100644 --- a/tests/mocha/cursor_test.js +++ b/tests/mocha/cursor_test.js @@ -6,7 +6,7 @@ goog.declareModuleId('Blockly.test.cursor'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; const {ASTNode} = goog.require('Blockly.ASTNode'); diff --git a/tests/mocha/dropdowndiv_test.js b/tests/mocha/dropdowndiv_test.js index 0c02c9f1a..d8199fc7e 100644 --- a/tests/mocha/dropdowndiv_test.js +++ b/tests/mocha/dropdowndiv_test.js @@ -6,7 +6,7 @@ goog.declareModuleId('Blockly.test.dropdown'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; suite('DropDownDiv', function() { diff --git a/tests/mocha/event_test.js b/tests/mocha/event_test.js index ae08f85e5..ce3cd58c6 100644 --- a/tests/mocha/event_test.js +++ b/tests/mocha/event_test.js @@ -7,9 +7,9 @@ goog.declareModuleId('Blockly.test.event'); const {ASTNode} = goog.require('Blockly.ASTNode'); -const {assertEventEquals, assertNthCallEventArgEquals, createFireChangeListenerSpy} = goog.require('Blockly.test.helpers.events'); -const {assertVariableValues} = goog.require('Blockly.test.helpers.variables'); -const {createGenUidStubWithReturns, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {assertEventEquals, assertNthCallEventArgEquals, createFireChangeListenerSpy} from './test_helpers/events.js'; +import {assertVariableValues} from './test_helpers/variables.js'; +import {createGenUidStubWithReturns, sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js'; const eventUtils = goog.require('Blockly.Events.utils'); goog.require('Blockly.WorkspaceComment'); diff --git a/tests/mocha/extensions_test.js b/tests/mocha/extensions_test.js index 233649cb8..d848b21e6 100644 --- a/tests/mocha/extensions_test.js +++ b/tests/mocha/extensions_test.js @@ -6,7 +6,7 @@ goog.declareModuleId('Blockly.test.extensions'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; suite('Extensions', function() { diff --git a/tests/mocha/field_angle_test.js b/tests/mocha/field_angle_test.js index d20b08c4b..8467e4b07 100644 --- a/tests/mocha/field_angle_test.js +++ b/tests/mocha/field_angle_test.js @@ -6,9 +6,9 @@ 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'); -const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {assertFieldValue, runConstructorSuiteTests, runFromJsonSuiteTests, runSetValueTests} from './test_helpers/fields.js'; +import {createTestBlock, defineRowBlock} from './test_helpers/block_definitions.js'; +import {sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js'; suite('Angle Fields', function() { diff --git a/tests/mocha/field_checkbox_test.js b/tests/mocha/field_checkbox_test.js index 384b2833e..a2b4704be 100644 --- a/tests/mocha/field_checkbox_test.js +++ b/tests/mocha/field_checkbox_test.js @@ -6,9 +6,9 @@ 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'); -const {defineRowBlock} = goog.require('Blockly.test.helpers.blockDefinitions'); +import {assertFieldValue, runConstructorSuiteTests, runFromJsonSuiteTests, runSetValueTests} from './test_helpers/fields.js'; +import {sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js'; +import {defineRowBlock} from './test_helpers/block_definitions.js'; suite('Checkbox Fields', function() { diff --git a/tests/mocha/field_colour_test.js b/tests/mocha/field_colour_test.js index 56d6522a6..63471b313 100644 --- a/tests/mocha/field_colour_test.js +++ b/tests/mocha/field_colour_test.js @@ -6,9 +6,9 @@ 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'); -const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {assertFieldValue, runConstructorSuiteTests, runFromJsonSuiteTests, runSetValueTests} from './test_helpers/fields.js'; +import {createTestBlock, defineRowBlock} from './test_helpers/block_definitions.js'; +import {sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js'; suite('Colour Fields', function() { diff --git a/tests/mocha/field_dropdown_test.js b/tests/mocha/field_dropdown_test.js index 9e23f0c9e..d672d8365 100644 --- a/tests/mocha/field_dropdown_test.js +++ b/tests/mocha/field_dropdown_test.js @@ -6,9 +6,9 @@ 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'); -const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {assertFieldValue, runConstructorSuiteTests, runFromJsonSuiteTests, runSetValueTests} from './test_helpers/fields.js'; +import {createTestBlock, defineRowBlock} from './test_helpers/block_definitions.js'; +import {sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js'; suite('Dropdown Fields', function() { diff --git a/tests/mocha/field_image_test.js b/tests/mocha/field_image_test.js index f7608c8b8..60e7be71d 100644 --- a/tests/mocha/field_image_test.js +++ b/tests/mocha/field_image_test.js @@ -6,8 +6,8 @@ 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'); +import {assertFieldValue, runConstructorSuiteTests, runFromJsonSuiteTests, runSetValueTests} from './test_helpers/fields.js'; +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; suite('Image Fields', function() { diff --git a/tests/mocha/field_label_serializable_test.js b/tests/mocha/field_label_serializable_test.js index 9485f003d..4280a5130 100644 --- a/tests/mocha/field_label_serializable_test.js +++ b/tests/mocha/field_label_serializable_test.js @@ -6,9 +6,9 @@ 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'); -const {createTestBlock, defineRowBlock} = goog.require('Blockly.test.helpers.blockDefinitions'); +import {assertFieldValue, runConstructorSuiteTests, runFromJsonSuiteTests, runSetValueTests} from './test_helpers/fields.js'; +import {sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js'; +import {createTestBlock, defineRowBlock} from './test_helpers/block_definitions.js'; suite('Label Serializable Fields', function() { diff --git a/tests/mocha/field_label_test.js b/tests/mocha/field_label_test.js index 66a22be99..ab44ce7b2 100644 --- a/tests/mocha/field_label_test.js +++ b/tests/mocha/field_label_test.js @@ -6,9 +6,9 @@ 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'); -const {createTestBlock} = goog.require('Blockly.test.helpers.blockDefinitions'); +import {assertFieldValue, runConstructorSuiteTests, runFromJsonSuiteTests, runSetValueTests} from './test_helpers/fields.js'; +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; +import {createTestBlock} from './test_helpers/block_definitions.js'; suite('Label Fields', function() { diff --git a/tests/mocha/field_multilineinput_test.js b/tests/mocha/field_multilineinput_test.js index 81da6616a..8d9c03033 100644 --- a/tests/mocha/field_multilineinput_test.js +++ b/tests/mocha/field_multilineinput_test.js @@ -6,10 +6,10 @@ 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'); -const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); -const {runCodeGenerationTestSuites} = goog.require('Blockly.test.helpers.codeGeneration'); +import {assertFieldValue, runConstructorSuiteTests, runFromJsonSuiteTests, runSetValueTests} from './test_helpers/fields.js'; +import {createTestBlock, defineRowBlock} from './test_helpers/block_definitions.js'; +import {sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js'; +import {runCodeGenerationTestSuites} from './test_helpers/code_generation.js'; suite('Multiline Input Fields', function() { diff --git a/tests/mocha/field_number_test.js b/tests/mocha/field_number_test.js index 17c044685..4a4836d1e 100644 --- a/tests/mocha/field_number_test.js +++ b/tests/mocha/field_number_test.js @@ -6,10 +6,10 @@ goog.declareModuleId('Blockly.test.fieldNumber'); -const {assertFieldValue, runConstructorSuiteTests, runFromJsonSuiteTests, runSetValueTests} = goog.require('Blockly.test.helpers.fields'); -const {defineRowBlock} = goog.require('Blockly.test.helpers.blockDefinitions'); -const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); -const {runTestCases} = goog.require('Blockly.test.helpers.common'); +import {assertFieldValue, runConstructorSuiteTests, runFromJsonSuiteTests, runSetValueTests} from './test_helpers/fields.js'; +import {defineRowBlock} from './test_helpers/block_definitions.js'; +import {sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js'; +import {runTestCases} from './test_helpers/common.js'; suite('Number Fields', function() { diff --git a/tests/mocha/field_registry_test.js b/tests/mocha/field_registry_test.js index ed4040482..ad7ee6f37 100644 --- a/tests/mocha/field_registry_test.js +++ b/tests/mocha/field_registry_test.js @@ -6,8 +6,8 @@ goog.declareModuleId('Blockly.test.fieldRegistry'); -const {createDeprecationWarningStub} = goog.require('Blockly.test.helpers.warnings'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {createDeprecationWarningStub} from './test_helpers/warnings.js'; +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; suite('Field Registry', function() { diff --git a/tests/mocha/field_test.js b/tests/mocha/field_test.js index 0e2abc52c..7631ccc84 100644 --- a/tests/mocha/field_test.js +++ b/tests/mocha/field_test.js @@ -6,8 +6,8 @@ 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'); +import {addBlockTypeToCleanup, addMessageToCleanup, sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js'; +import {createDeprecationWarningStub} from './test_helpers/warnings.js'; suite('Abstract Fields', function() { diff --git a/tests/mocha/field_textinput_test.js b/tests/mocha/field_textinput_test.js index 26ced046c..793048620 100644 --- a/tests/mocha/field_textinput_test.js +++ b/tests/mocha/field_textinput_test.js @@ -6,9 +6,9 @@ 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'); -const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {assertFieldValue, runConstructorSuiteTests, runFromJsonSuiteTests, runSetValueTests} from './test_helpers/fields.js'; +import {createTestBlock, defineRowBlock} from './test_helpers/block_definitions.js'; +import {sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js'; suite('Text Input Fields', function() { diff --git a/tests/mocha/field_variable_test.js b/tests/mocha/field_variable_test.js index e61c3e593..51249430e 100644 --- a/tests/mocha/field_variable_test.js +++ b/tests/mocha/field_variable_test.js @@ -6,9 +6,9 @@ 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'); -const {createTestBlock, defineRowBlock} = goog.require('Blockly.test.helpers.blockDefinitions'); +import {assertFieldValue, runConstructorSuiteTests, runFromJsonSuiteTests, runSetValueTests} from './test_helpers/fields.js'; +import {createGenUidStubWithReturns, sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js'; +import {createTestBlock, defineRowBlock} from './test_helpers/block_definitions.js'; suite('Variable Fields', function() { diff --git a/tests/mocha/flyout_test.js b/tests/mocha/flyout_test.js index e14aae24d..e9ccd4e49 100644 --- a/tests/mocha/flyout_test.js +++ b/tests/mocha/flyout_test.js @@ -6,8 +6,8 @@ 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'); +import {defineStackBlock, sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js'; +import {getBasicToolbox, getChildItem, getCollapsibleItem, getDeeplyNestedJSON, getInjectedToolbox, getNonCollapsibleItem, getProperSimpleJson, getSeparator, getSimpleJson, getXmlArray} from './test_helpers/toolbox_definitions.js'; suite('Flyout', function() { diff --git a/tests/mocha/generator_test.js b/tests/mocha/generator_test.js index 47634e55b..f4d5ed819 100644 --- a/tests/mocha/generator_test.js +++ b/tests/mocha/generator_test.js @@ -11,7 +11,7 @@ const {javaScriptGenerator} = goog.require('Blockly.JavaScript'); const {luaGenerator} = goog.require('Blockly.Lua'); const {phpGenerator} = goog.require('Blockly.PHP'); const {pythonGenerator} = goog.require('Blockly.Python'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; suite('Generator', function() { diff --git a/tests/mocha/gesture_test.js b/tests/mocha/gesture_test.js index 8dff04d21..8315398ee 100644 --- a/tests/mocha/gesture_test.js +++ b/tests/mocha/gesture_test.js @@ -6,11 +6,11 @@ goog.declareModuleId('Blockly.test.gesture'); -const {assertEventFired, assertEventNotFired} = goog.require('Blockly.test.helpers.events'); -const {defineBasicBlockWithField} = goog.require('Blockly.test.helpers.blockDefinitions'); -const {dispatchPointerEvent} = goog.require('Blockly.test.helpers.userInput'); +import {assertEventFired, assertEventNotFired} from './test_helpers/events.js'; +import {defineBasicBlockWithField} from './test_helpers/block_definitions.js'; +import {dispatchPointerEvent} from './test_helpers/user_input.js'; const eventUtils = goog.require('Blockly.Events.utils'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; suite('Gesture', function() { diff --git a/tests/mocha/input_test.js b/tests/mocha/input_test.js index d74e46c62..eb82738b1 100644 --- a/tests/mocha/input_test.js +++ b/tests/mocha/input_test.js @@ -6,7 +6,7 @@ goog.declareModuleId('Blockly.test.input'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; suite('Inputs', function() { diff --git a/tests/mocha/insertion_marker_test.js b/tests/mocha/insertion_marker_test.js index d54e3d195..c03fbafa3 100644 --- a/tests/mocha/insertion_marker_test.js +++ b/tests/mocha/insertion_marker_test.js @@ -6,7 +6,7 @@ goog.declareModuleId('Blockly.test.insertionMarker'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; suite('InsertionMarkers', function() { diff --git a/tests/mocha/jso_deserialization_test.js b/tests/mocha/jso_deserialization_test.js index aeefa2205..7df21c9f3 100644 --- a/tests/mocha/jso_deserialization_test.js +++ b/tests/mocha/jso_deserialization_test.js @@ -6,8 +6,8 @@ goog.declareModuleId('Blockly.test.jsoDeserialization'); -const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); -const {assertEventFired} = goog.require('Blockly.test.helpers.events'); +import {sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js'; +import {assertEventFired} from './test_helpers/events.js'; const eventUtils = goog.require('Blockly.Events.utils'); diff --git a/tests/mocha/jso_serialization_test.js b/tests/mocha/jso_serialization_test.js index 4a07e04d7..278ceb1e3 100644 --- a/tests/mocha/jso_serialization_test.js +++ b/tests/mocha/jso_serialization_test.js @@ -6,8 +6,8 @@ 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'); +import {createGenUidStubWithReturns, sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js'; +import {defineRowBlock, defineStackBlock, defineStatementBlock} from './test_helpers/block_definitions.js'; suite('JSO Serialization', function() { diff --git a/tests/mocha/json_test.js b/tests/mocha/json_test.js index 593a49e05..383b49130 100644 --- a/tests/mocha/json_test.js +++ b/tests/mocha/json_test.js @@ -6,8 +6,8 @@ goog.declareModuleId('Blockly.test.json'); -const {addMessageToCleanup, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); -const {assertNoWarnings, assertWarnings} = goog.require('Blockly.test.helpers.warnings'); +import {addMessageToCleanup, sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; +import {assertNoWarnings, assertWarnings} from './test_helpers/warnings.js'; suite('JSON Block Definitions', function() { diff --git a/tests/mocha/keydown_test.js b/tests/mocha/keydown_test.js index f8165577c..b166b0c03 100644 --- a/tests/mocha/keydown_test.js +++ b/tests/mocha/keydown_test.js @@ -6,9 +6,9 @@ goog.declareModuleId('Blockly.test.keydown'); -const {createKeyDownEvent} = goog.require('Blockly.test.helpers.userInput'); -const {defineStackBlock} = goog.require('Blockly.test.helpers.blockDefinitions'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +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() { diff --git a/tests/mocha/metrics_test.js b/tests/mocha/metrics_test.js index c66b5f5d3..9e7eb001f 100644 --- a/tests/mocha/metrics_test.js +++ b/tests/mocha/metrics_test.js @@ -6,7 +6,7 @@ goog.declareModuleId('Blockly.test.metrics'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; suite('Metrics', function() { diff --git a/tests/mocha/mutator_test.js b/tests/mocha/mutator_test.js index 65b35c7f3..602dbbeb2 100644 --- a/tests/mocha/mutator_test.js +++ b/tests/mocha/mutator_test.js @@ -7,8 +7,8 @@ goog.declareModuleId('Blockly.test.mutator'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); -const {createRenderedBlock, defineMutatorBlocks} = goog.require('Blockly.test.helpers.blockDefinitions'); +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; +import {createRenderedBlock, defineMutatorBlocks} from './test_helpers/block_definitions.js'; suite('Mutator', function() { diff --git a/tests/mocha/names_test.js b/tests/mocha/names_test.js index c7d5a9166..e9a8195be 100644 --- a/tests/mocha/names_test.js +++ b/tests/mocha/names_test.js @@ -6,7 +6,7 @@ goog.declareModuleId('Blockly.test.names'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; suite('Names', function() { diff --git a/tests/mocha/registry_test.js b/tests/mocha/registry_test.js index 17fcf09ac..b6bb66086 100644 --- a/tests/mocha/registry_test.js +++ b/tests/mocha/registry_test.js @@ -6,8 +6,8 @@ goog.declareModuleId('Blockly.test.registry'); -const {assertWarnings} = goog.require('Blockly.test.helpers.warnings'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {assertWarnings} from './test_helpers/warnings.js'; +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; suite('Registry', function() { diff --git a/tests/mocha/serializer_test.js b/tests/mocha/serializer_test.js index eebde06b3..a77a4341f 100644 --- a/tests/mocha/serializer_test.js +++ b/tests/mocha/serializer_test.js @@ -6,8 +6,8 @@ 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'); +import {TestCase, TestSuite, runTestCases, runTestSuites} from './test_helpers/common.js'; +import {sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js'; // TODO: Move this into samples as part of the dev-tools package. diff --git a/tests/mocha/shortcut_registry_test.js b/tests/mocha/shortcut_registry_test.js index eb473ab87..c41fa1910 100644 --- a/tests/mocha/shortcut_registry_test.js +++ b/tests/mocha/shortcut_registry_test.js @@ -6,8 +6,8 @@ goog.declareModuleId('Blockly.test.shortcutRegistry'); -const {createKeyDownEvent} = goog.require('Blockly.test.helpers.userInput'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {createKeyDownEvent} from './test_helpers/user_input.js'; +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; suite('Keyboard Shortcut Registry Test', function() { diff --git a/tests/mocha/theme_test.js b/tests/mocha/theme_test.js index d12233e4b..9e2788dd8 100644 --- a/tests/mocha/theme_test.js +++ b/tests/mocha/theme_test.js @@ -6,9 +6,9 @@ goog.declareModuleId('Blockly.test.theme'); -const {assertEventFired} = goog.require('Blockly.test.helpers.events'); +import {assertEventFired} from './test_helpers/events.js'; const eventUtils = goog.require('Blockly.Events.utils'); -const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js'; suite('Theme', function() { diff --git a/tests/mocha/toolbox_test.js b/tests/mocha/toolbox_test.js index 93ea3ab1b..40007651c 100644 --- a/tests/mocha/toolbox_test.js +++ b/tests/mocha/toolbox_test.js @@ -6,9 +6,9 @@ goog.declareModuleId('Blockly.test.toolbox'); -const {defineStackBlock} = goog.require('Blockly.test.helpers.blockDefinitions'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); -const {getBasicToolbox, getCategoryJSON, getChildItem, getCollapsibleItem, getDeeplyNestedJSON, getInjectedToolbox, getNonCollapsibleItem, getSeparator, getSimpleJson, getXmlArray} = goog.require('Blockly.test.helpers.toolboxDefinitions'); +import {defineStackBlock} from './test_helpers/block_definitions.js'; +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; +import {getBasicToolbox, getCategoryJSON, getChildItem, getCollapsibleItem, getDeeplyNestedJSON, getInjectedToolbox, getNonCollapsibleItem, getSeparator, getSimpleJson, getXmlArray} from './test_helpers/toolbox_definitions.js'; suite('Toolbox', function() { diff --git a/tests/mocha/tooltip_test.js b/tests/mocha/tooltip_test.js index 187bfe004..3d3755aa0 100644 --- a/tests/mocha/tooltip_test.js +++ b/tests/mocha/tooltip_test.js @@ -6,7 +6,7 @@ goog.declareModuleId('Blockly.test.tooltip'); -const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js'; suite('Tooltip', function() { diff --git a/tests/mocha/trashcan_test.js b/tests/mocha/trashcan_test.js index 890c0f7e9..6f531d850 100644 --- a/tests/mocha/trashcan_test.js +++ b/tests/mocha/trashcan_test.js @@ -6,11 +6,11 @@ goog.declareModuleId('Blockly.test.trashcan'); -const {assertEventFired, assertEventNotFired} = goog.require('Blockly.test.helpers.events'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); -const {defineBasicBlockWithField, defineMutatorBlocks, defineRowBlock, defineStackBlock, defineStatementBlock} = goog.require('Blockly.test.helpers.blockDefinitions'); +import {assertEventFired, assertEventNotFired} from './test_helpers/events.js'; +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; +import {defineBasicBlockWithField, defineMutatorBlocks, defineRowBlock, defineStackBlock, defineStatementBlock} from './test_helpers/block_definitions.js'; const eventUtils = goog.require('Blockly.Events.utils'); -const {simulateClick} = goog.require('Blockly.test.helpers.userInput'); +import {simulateClick} from './test_helpers/user_input.js'; suite("Trashcan", function() { diff --git a/tests/mocha/utils_test.js b/tests/mocha/utils_test.js index 587e91b99..fd4fbae0c 100644 --- a/tests/mocha/utils_test.js +++ b/tests/mocha/utils_test.js @@ -6,7 +6,7 @@ goog.declareModuleId('Blockly.test.utils'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; suite('Utils', function() { diff --git a/tests/mocha/variable_map_test.js b/tests/mocha/variable_map_test.js index 91804a7f5..c6a4701fc 100644 --- a/tests/mocha/variable_map_test.js +++ b/tests/mocha/variable_map_test.js @@ -6,8 +6,8 @@ goog.declareModuleId('Blockly.test.variableMap'); -const {assertVariableValues} = goog.require('Blockly.test.helpers.variables'); -const {createGenUidStubWithReturns, sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {assertVariableValues} from './test_helpers/variables.js'; +import {createGenUidStubWithReturns, sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; suite('Variable Map', function() { diff --git a/tests/mocha/variable_model_test.js b/tests/mocha/variable_model_test.js index a0517e3a9..ae9c894a6 100644 --- a/tests/mocha/variable_model_test.js +++ b/tests/mocha/variable_model_test.js @@ -6,7 +6,7 @@ goog.declareModuleId('Blockly.test.variableModel'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; suite('Variable Model', function() { diff --git a/tests/mocha/widget_div_test.js b/tests/mocha/widget_div_test.js index 32a44539e..864f4c09d 100644 --- a/tests/mocha/widget_div_test.js +++ b/tests/mocha/widget_div_test.js @@ -6,7 +6,7 @@ goog.declareModuleId('Blockly.test.widgetDiv'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; suite('WidgetDiv', function() { diff --git a/tests/mocha/workspace_comment_test.js b/tests/mocha/workspace_comment_test.js index 80ae8b47a..4fbb822f7 100644 --- a/tests/mocha/workspace_comment_test.js +++ b/tests/mocha/workspace_comment_test.js @@ -7,7 +7,7 @@ goog.declareModuleId('Blockly.test.workspaceComment'); goog.require('Blockly.WorkspaceComment'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; suite('Workspace comment', function() { diff --git a/tests/mocha/workspace_svg_test.js b/tests/mocha/workspace_svg_test.js index c6fbbe953..c1cce96b3 100644 --- a/tests/mocha/workspace_svg_test.js +++ b/tests/mocha/workspace_svg_test.js @@ -6,12 +6,12 @@ goog.declareModuleId('Blockly.test.workspaceSvg'); -const {assertEventFired, assertEventNotFired, createFireChangeListenerSpy} = goog.require('Blockly.test.helpers.events'); -const {assertVariableValues} = goog.require('Blockly.test.helpers.variables'); -const {defineStackBlock} = goog.require('Blockly.test.helpers.blockDefinitions'); +import {assertEventFired, assertEventNotFired, createFireChangeListenerSpy} from './test_helpers/events.js'; +import {assertVariableValues} from './test_helpers/variables.js'; +import {defineStackBlock} from './test_helpers/block_definitions.js'; const eventUtils = goog.require('Blockly.Events.utils'); -const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); -const {testAWorkspace} = goog.require('Blockly.test.helpers.workspace'); +import {sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js'; +import {testAWorkspace} from './test_helpers/workspace.js'; suite('WorkspaceSvg', function() { diff --git a/tests/mocha/workspace_test.js b/tests/mocha/workspace_test.js index d19806775..ad90ebad8 100644 --- a/tests/mocha/workspace_test.js +++ b/tests/mocha/workspace_test.js @@ -6,9 +6,9 @@ goog.declareModuleId('Blockly.test.workspace'); -const {assertVariableValues} = goog.require('Blockly.test.helpers.variables'); -const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); -const {testAWorkspace} = goog.require('Blockly.test.helpers.workspace'); +import {assertVariableValues} from './test_helpers/variables.js'; +import {sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js'; +import {testAWorkspace} from './test_helpers/workspace.js'; suite('Workspace', function() { diff --git a/tests/mocha/xml_test.js b/tests/mocha/xml_test.js index 6c9ee2629..1306918e6 100644 --- a/tests/mocha/xml_test.js +++ b/tests/mocha/xml_test.js @@ -6,8 +6,8 @@ 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'); +import {addBlockTypeToCleanup, createGenUidStubWithReturns, sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js'; +import {assertVariableValues} from './test_helpers/variables.js'; suite('XML', function() { diff --git a/tests/mocha/zoom_controls_test.js b/tests/mocha/zoom_controls_test.js index c45c07d9d..6b50d795e 100644 --- a/tests/mocha/zoom_controls_test.js +++ b/tests/mocha/zoom_controls_test.js @@ -6,10 +6,10 @@ goog.declareModuleId('Blockly.test.zoomControls'); -const {assertEventFired, assertEventNotFired} = goog.require('Blockly.test.helpers.events'); +import {assertEventFired, assertEventNotFired} from './test_helpers/events.js'; const eventUtils = goog.require('Blockly.Events.utils'); -const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers.setupTeardown'); -const {simulateClick} = goog.require('Blockly.test.helpers.userInput'); +import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js'; +import {simulateClick} from './test_helpers/user_input.js'; suite("Zoom Controls", function() {