JS: add suffix '_test' to test module output files to avoid name conflicts (KT-16979)

Also stop setting AMD module ids explicitly.
2017-03-27 18:44:53 +03:00
parent 867bd13ce4
commit 4086a84622
6 changed files with 33 additions and 14 deletions
@@ -1,6 +1,8 @@

 var emulatedModules = { kotlin: kotlin };
 var module = { exports: {} };
+var currentModuleId;
+

 // TODO don't expose by default when run test with AMD module kind
 function require(moduleId) {
@@ -14,11 +16,19 @@ var $kotlin_test_internal$ = {
    },
    endModule : function(moduleId) {
        emulatedModules[moduleId] = module.exports;
+    },
+    setModuleId: function(moduleId) {
+        currentModuleId = moduleId;
    }
 };

 // TODO expose only when run test with AMD or UMD module kind
 function define(moduleId, dependencies, body) {
+    if (Array.isArray(moduleId)) {
+        body = dependencies;
+        dependencies = moduleId;
+        moduleId = currentModuleId;
+    }
    var resolvedDependencies = [];
    emulatedModules[moduleId] = {};
    for (var i = 0; i < dependencies.length; ++i) {