chore: convert other imports in tests to esm imports

This commit is contained in:
Beka Westberg
2022-07-25 22:53:02 +00:00
parent 3e50e1ba14
commit 9b019254f4
17 changed files with 21 additions and 20 deletions
+1 -1
View File
@@ -6,7 +6,7 @@
goog.declareModuleId('Blockly.test.astNode');
const {ASTNode} = goog.require('Blockly.ASTNode');
import {ASTNode} from '../../core/keyboard_nav/ast_node.js';
import {sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js';
+1 -1
View File
@@ -7,7 +7,7 @@
goog.declareModuleId('Blockly.test.blockCreateEvent');
import {assertEventFired} from './test_helpers/events.js';
const eventUtils = goog.require('Blockly.Events.utils');
import * as eventUtils from '../../core/events/utils.js';
import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js';
+1 -1
View File
@@ -6,7 +6,7 @@
goog.declareModuleId('Blockly.test.blockJson');
const {Align} = goog.require('Blockly.Input');
import {Align} from '../../core/input.js';
suite('Block JSON initialization', function() {
+3 -3
View File
@@ -6,11 +6,11 @@
goog.declareModuleId('Blockly.test.blocks');
const {Blocks} = goog.require('Blockly.blocks');
const {ConnectionType} = goog.require('Blockly.ConnectionType');
import {Blocks} from '../../blocks/blocks.js';
import {ConnectionType} from '../../core/connection_type.js';
import {createDeprecationWarningStub} from './test_helpers/warnings.js';
import {createRenderedBlock} from './test_helpers/block_definitions.js';
const eventUtils = goog.require('Blockly.Events.utils');
import * as eventUtils from '../../core/events/utils.js';
import {sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js';
+1 -1
View File
@@ -7,7 +7,7 @@
goog.declareModuleId('Blockly.test.comments');
import {assertEventFired} from './test_helpers/events.js';
const eventUtils = goog.require('Blockly.Events.utils');
import * as eventUtils from '../../core/events/utils.js';
import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js';
+1 -1
View File
@@ -6,7 +6,7 @@
goog.declareModuleId('Blockly.test.connectionChecker');
const {ConnectionType} = goog.require('Blockly.ConnectionType');
import {ConnectionType} from '../../core/connection_type.js';
import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js';
+1 -1
View File
@@ -6,7 +6,7 @@
goog.declareModuleId('Blockly.test.connectionDb');
const {ConnectionType} = goog.require('Blockly.ConnectionType');
import {ConnectionType} from '../../core/connection_type.js';
import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js';
+1 -1
View File
@@ -7,7 +7,7 @@
goog.declareModuleId('Blockly.test.cursor');
import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js';
const {ASTNode} = goog.require('Blockly.ASTNode');
import {ASTNode} from '../../core/keyboard_nav/ast_node.js';
suite('Cursor', function() {
+3 -3
View File
@@ -6,12 +6,12 @@
goog.declareModuleId('Blockly.test.event');
const {ASTNode} = goog.require('Blockly.ASTNode');
import {ASTNode} from '../../core/keyboard_nav/ast_node.js';
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');
import * as eventUtils from '../../core/events/utils.js';
import {WorkspaceComment} from '../../core/workspace_comment.js';
suite('Events', function() {
+1
View File
@@ -6,6 +6,7 @@
goog.declareModuleId('Blockly.test.generator');
// TODO: Not sure hwo to handle this.
const {dartGenerator} = goog.require('Blockly.Dart');
const {javaScriptGenerator} = goog.require('Blockly.JavaScript');
const {luaGenerator} = goog.require('Blockly.Lua');
+1 -1
View File
@@ -9,7 +9,7 @@ goog.declareModuleId('Blockly.test.gesture');
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');
import * as eventUtils from '../../core/events/utils.js';
import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js';
+1 -1
View File
@@ -8,7 +8,7 @@ goog.declareModuleId('Blockly.test.jsoDeserialization');
import {sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js';
import {assertEventFired} from './test_helpers/events.js';
const eventUtils = goog.require('Blockly.Events.utils');
import * as eventUtils from '../../core/events/utils.js';
suite('JSO Deserialization', function() {
+1 -1
View File
@@ -7,7 +7,7 @@
goog.declareModuleId('Blockly.test.theme');
import {assertEventFired} from './test_helpers/events.js';
const eventUtils = goog.require('Blockly.Events.utils');
import * as eventUtils from '../../core/events/utils.js';
import {sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js';
+1 -1
View File
@@ -9,7 +9,7 @@ goog.declareModuleId('Blockly.test.trashcan');
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');
import * as eventUtils from '../../core/events/utils.js';
import {simulateClick} from './test_helpers/user_input.js';
+1 -1
View File
@@ -6,7 +6,7 @@
goog.declareModuleId('Blockly.test.workspaceComment');
goog.require('Blockly.WorkspaceComment');
import {WorkspaceComment} from '../../core/workspace_comment.js';
import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js';
+1 -1
View File
@@ -9,7 +9,7 @@ goog.declareModuleId('Blockly.test.workspaceSvg');
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');
import * as eventUtils from '../../core/events/utils.js';
import {sharedTestSetup, sharedTestTeardown, workspaceTeardown} from './test_helpers/setup_teardown.js';
import {testAWorkspace} from './test_helpers/workspace.js';
+1 -1
View File
@@ -7,7 +7,7 @@
goog.declareModuleId('Blockly.test.zoomControls');
import {assertEventFired, assertEventNotFired} from './test_helpers/events.js';
const eventUtils = goog.require('Blockly.Events.utils');
import * as eventUtils from '../../core/events/utils.js';
import {sharedTestSetup, sharedTestTeardown} from './test_helpers/setup_teardown.js';
import {simulateClick} from './test_helpers/user_input.js';