From 5d6a2bb3a0c7f5927d870b7f9c574432876cf05e Mon Sep 17 00:00:00 2001 From: Florian Rival Date: Tue, 13 Jul 2021 13:46:29 +0100 Subject: [PATCH] Fix GDJS tests (regression since rework of GDJS build in the editor) Don't show in changelog --- GDJS/scripts/build.js | 8 +-- GDJS/tests/karma.conf.js | 108 +++++++++++++++++++-------------------- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/GDJS/scripts/build.js b/GDJS/scripts/build.js index 4689d2e760..05b25a6cbd 100644 --- a/GDJS/scripts/build.js +++ b/GDJS/scripts/build.js @@ -15,12 +15,12 @@ const renameBuiltFile = (outPath) => { return outPath.replace(/\.ts$/, '.js'); }; -const bundledOutPath = args.out; -if (!bundledOutPath) { +const bundledOutPath = + args.out || path.join(__dirname, '../../newIDE/app/resources/GDJS/Runtime'); +if (!args.out) { shell.echo( - `❌ --out (path where to build GDJS Runtime and Extensions) is required.` + `ℹ️ --out (path where to build GDJS Runtime and Extensions) not specified. Using "../../newIDE/app/resources/GDJS/Runtime" by default (used by electron-app and GDJS tests).` ); - shell.exit(1); } shell.mkdir('-p', bundledOutPath); diff --git a/GDJS/tests/karma.conf.js b/GDJS/tests/karma.conf.js index 51ccb3b32f..83780cacaa 100644 --- a/GDJS/tests/karma.conf.js +++ b/GDJS/tests/karma.conf.js @@ -20,62 +20,62 @@ module.exports = function (config) { 'node_modules/expect.js/index.js', //GDJS game engine files: (Order is important) - '../Runtime-dist/libs/jshashtable.js', - '../Runtime-dist/gd.js', - '../Runtime-dist/libs/rbush.js', - '../Runtime-dist/cocos-renderers/cocos-director-manager.js', - '../Runtime-dist/pixi-renderers/pixi.js', - '../Runtime-dist/pixi-renderers/*.js', - '../Runtime-dist/howler-sound-manager/howler.min.js', - '../Runtime-dist/howler-sound-manager/howler-sound-manager.js', - '../Runtime-dist/fontfaceobserver-font-manager/fontfaceobserver.js', - '../Runtime-dist/fontfaceobserver-font-manager/fontfaceobserver-font-manager.js', - '../Runtime-dist/jsonmanager.js', - '../Runtime-dist/timemanager.js', - '../Runtime-dist/timemanager.js', - '../Runtime-dist/runtimeobject.js', - '../Runtime-dist/runtimescene.js', - '../Runtime-dist/scenestack.js', - '../Runtime-dist/profiler.js', - '../Runtime-dist/polygon.js', - '../Runtime-dist/force.js', - '../Runtime-dist/layer.js', - '../Runtime-dist/timer.js', - '../Runtime-dist/inputmanager.js', - '../Runtime-dist/runtimegame.js', - '../Runtime-dist/variable.js', - '../Runtime-dist/variablescontainer.js', - '../Runtime-dist/oncetriggers.js', - '../Runtime-dist/runtimebehavior.js', - '../Runtime-dist/spriteruntimeobject.js', - '../Runtime-dist/events-tools/commontools.js', - '../Runtime-dist/events-tools/runtimescenetools.js', - '../Runtime-dist/events-tools/inputtools.js', - '../Runtime-dist/events-tools/networktools.js', - '../Runtime-dist/events-tools/objecttools.js', - '../Runtime-dist/events-tools/cameratools.js', - '../Runtime-dist/events-tools/soundtools.js', - '../Runtime-dist/events-tools/storagetools.js', - '../Runtime-dist/events-tools/stringtools.js', - '../Runtime-dist/events-tools/windowtools.js', - '../Runtime-dist/websocket-debugger-client/hot-reloader.js', + '../../newIDE/app/resources/GDJS/Runtime/libs/jshashtable.js', + '../../newIDE/app/resources/GDJS/Runtime/gd.js', + '../../newIDE/app/resources/GDJS/Runtime/libs/rbush.js', + '../../newIDE/app/resources/GDJS/Runtime/cocos-renderers/cocos-director-manager.js', + '../../newIDE/app/resources/GDJS/Runtime/pixi-renderers/pixi.js', + '../../newIDE/app/resources/GDJS/Runtime/pixi-renderers/*.js', + '../../newIDE/app/resources/GDJS/Runtime/howler-sound-manager/howler.min.js', + '../../newIDE/app/resources/GDJS/Runtime/howler-sound-manager/howler-sound-manager.js', + '../../newIDE/app/resources/GDJS/Runtime/fontfaceobserver-font-manager/fontfaceobserver.js', + '../../newIDE/app/resources/GDJS/Runtime/fontfaceobserver-font-manager/fontfaceobserver-font-manager.js', + '../../newIDE/app/resources/GDJS/Runtime/jsonmanager.js', + '../../newIDE/app/resources/GDJS/Runtime/timemanager.js', + '../../newIDE/app/resources/GDJS/Runtime/timemanager.js', + '../../newIDE/app/resources/GDJS/Runtime/runtimeobject.js', + '../../newIDE/app/resources/GDJS/Runtime/runtimescene.js', + '../../newIDE/app/resources/GDJS/Runtime/scenestack.js', + '../../newIDE/app/resources/GDJS/Runtime/profiler.js', + '../../newIDE/app/resources/GDJS/Runtime/polygon.js', + '../../newIDE/app/resources/GDJS/Runtime/force.js', + '../../newIDE/app/resources/GDJS/Runtime/layer.js', + '../../newIDE/app/resources/GDJS/Runtime/timer.js', + '../../newIDE/app/resources/GDJS/Runtime/inputmanager.js', + '../../newIDE/app/resources/GDJS/Runtime/runtimegame.js', + '../../newIDE/app/resources/GDJS/Runtime/variable.js', + '../../newIDE/app/resources/GDJS/Runtime/variablescontainer.js', + '../../newIDE/app/resources/GDJS/Runtime/oncetriggers.js', + '../../newIDE/app/resources/GDJS/Runtime/runtimebehavior.js', + '../../newIDE/app/resources/GDJS/Runtime/spriteruntimeobject.js', + '../../newIDE/app/resources/GDJS/Runtime/events-tools/commontools.js', + '../../newIDE/app/resources/GDJS/Runtime/events-tools/runtimescenetools.js', + '../../newIDE/app/resources/GDJS/Runtime/events-tools/inputtools.js', + '../../newIDE/app/resources/GDJS/Runtime/events-tools/networktools.js', + '../../newIDE/app/resources/GDJS/Runtime/events-tools/objecttools.js', + '../../newIDE/app/resources/GDJS/Runtime/events-tools/cameratools.js', + '../../newIDE/app/resources/GDJS/Runtime/events-tools/soundtools.js', + '../../newIDE/app/resources/GDJS/Runtime/events-tools/storagetools.js', + '../../newIDE/app/resources/GDJS/Runtime/events-tools/stringtools.js', + '../../newIDE/app/resources/GDJS/Runtime/events-tools/windowtools.js', + '../../newIDE/app/resources/GDJS/Runtime/websocket-debugger-client/hot-reloader.js', //Extensions: - '../Runtime-dist/Extensions/DraggableBehavior/draggableruntimebehavior.js', - '../Runtime-dist/Extensions/PlatformBehavior/platformerobjectruntimebehavior.js', - '../Runtime-dist/Extensions/PlatformBehavior/platformruntimebehavior.js', - '../Runtime-dist/Extensions/LinkedObjects/linkedobjects.js', - '../Runtime-dist/Extensions/Inventory/inventory.js', - '../Runtime-dist/Extensions/Inventory/inventorytools.js', - '../Runtime-dist/Extensions/Lighting/lightruntimeobject.js', - '../Runtime-dist/Extensions/Lighting/lightruntimeobject-pixi-renderer.js', - '../Runtime-dist/Extensions/Lighting/lightobstacleruntimebehavior.js', - '../Runtime-dist/Extensions/PathfindingBehavior/pathfindingobstacleruntimebehavior.js', - '../Runtime-dist/Extensions/PathfindingBehavior/pathfindingruntimebehavior.js', - '../Runtime-dist/Extensions/TopDownMovementBehavior/topdownmovementruntimebehavior.js', - '../Runtime-dist/Extensions/TopDownMovementBehavior/topdownobstacleruntimebehavior.js', - '../Runtime-dist/Extensions/Firebase/A_firebasejs/*.js', - '../Runtime-dist/Extensions/Firebase/B_firebasetools/*.js', + '../../newIDE/app/resources/GDJS/Runtime/Extensions/DraggableBehavior/draggableruntimebehavior.js', + '../../newIDE/app/resources/GDJS/Runtime/Extensions/PlatformBehavior/platformerobjectruntimebehavior.js', + '../../newIDE/app/resources/GDJS/Runtime/Extensions/PlatformBehavior/platformruntimebehavior.js', + '../../newIDE/app/resources/GDJS/Runtime/Extensions/LinkedObjects/linkedobjects.js', + '../../newIDE/app/resources/GDJS/Runtime/Extensions/Inventory/inventory.js', + '../../newIDE/app/resources/GDJS/Runtime/Extensions/Inventory/inventorytools.js', + '../../newIDE/app/resources/GDJS/Runtime/Extensions/Lighting/lightruntimeobject.js', + '../../newIDE/app/resources/GDJS/Runtime/Extensions/Lighting/lightruntimeobject-pixi-renderer.js', + '../../newIDE/app/resources/GDJS/Runtime/Extensions/Lighting/lightobstacleruntimebehavior.js', + '../../newIDE/app/resources/GDJS/Runtime/Extensions/PathfindingBehavior/pathfindingobstacleruntimebehavior.js', + '../../newIDE/app/resources/GDJS/Runtime/Extensions/PathfindingBehavior/pathfindingruntimebehavior.js', + '../../newIDE/app/resources/GDJS/Runtime/Extensions/TopDownMovementBehavior/topdownmovementruntimebehavior.js', + '../../newIDE/app/resources/GDJS/Runtime/Extensions/TopDownMovementBehavior/topdownobstacleruntimebehavior.js', + '../../newIDE/app/resources/GDJS/Runtime/Extensions/Firebase/A_firebasejs/*.js', + '../../newIDE/app/resources/GDJS/Runtime/Extensions/Firebase/B_firebasetools/*.js', // Test extensions: './tests/Extensions/**.js',