fixes #1221 and adds tests for it

stealjs · Jul 2, 2017 · 65abac0 · 65abac0
1 parent 5ef2d0d
commit 65abac0
Show file tree

Hide file tree

Showing 14 changed files with 53 additions and 52 deletions.
diff --git a/src/system-extension-contextual.js b/src/system-extension-contextual.js
@@ -17,7 +17,7 @@ addStealExtension(function (loader) {
       if (definer) {
         var localName = name + '/' + parentName;
 
-        if(!loader.has(name)) {
+        if(!loader.has(localName)) {
           // `definer` could be a function or could be a moduleName
           if (typeof definer === 'string') {
             definer = pluginLoader['import'](definer);

diff --git a/test/clone-within-dynamic-imports/first-test.js b/test/clone-within-dynamic-imports/first-test.js
diff --git a/test/clone-within-dynamic-imports/second-runs-tests.js b/test/clone-within-dynamic-imports/second-runs-tests.js
diff --git a/test/clone-within-dynamic-imports/second-test.js b/test/clone-within-dynamic-imports/second-test.js
diff --git a/test/clone-within-dynamic-imports/test.js b/test/clone-within-dynamic-imports/test.js
diff --git a/test/clone-within-dynamic-imports/within-dynamic-imports.html b/test/clone-within-dynamic-imports/within-dynamic-imports.html
diff --git a/test/ext-steal-clone/multiple/first-test.js b/test/ext-steal-clone/multiple/first-test.js
@@ -0,0 +1,5 @@
+var clone = require("steal-clone");
+
+module.exports = function(){
+	return clone({}).import("./first")
+}
diff --git a/test/clone-within-dynamic-imports/first.js → test/ext-steal-clone/multiple/first.js b/test/clone-within-dynamic-imports/first.js → test/ext-steal-clone/multiple/first.js
@@ -1,2 +1 @@
-console.log("running first");
 module.exports = {name: "first"};
diff --git a/test/ext-steal-clone/multiple/index.html b/test/ext-steal-clone/multiple/index.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>clone tests</title>
+</head>
+<body>
+<script>
+	window.done = window.parent.done;
+	window.assert = window.parent.assert;
+</script>
+<script type="text/javascript"
+	src="../../../steal.js"
+	data-config="../../config.js"
+	data-main="ext-steal-clone/multiple/test"></script>
+</script>
+</body>
+</html>
diff --git a/test/ext-steal-clone/multiple/second-runs-tests.js b/test/ext-steal-clone/multiple/second-runs-tests.js
@@ -0,0 +1,5 @@
+var clone = require("steal-clone");
+
+module.exports = function(){
+	return clone({}).import('./second')
+};
diff --git a/test/ext-steal-clone/multiple/second-test.js b/test/ext-steal-clone/multiple/second-test.js
@@ -0,0 +1 @@
+module.exports = require("./second-runs-tests");
diff --git a/test/clone-within-dynamic-imports/second.js → test/ext-steal-clone/multiple/second.js b/test/clone-within-dynamic-imports/second.js → test/ext-steal-clone/multiple/second.js
@@ -1,2 +1 @@
-console.log("running second");
 module.exports = {name: "second"};
diff --git a/test/ext-steal-clone/multiple/test.js b/test/ext-steal-clone/multiple/test.js
@@ -0,0 +1,18 @@
+var doClone1 = require("./first-test");
+var doClone2 = require("./second-test");
+
+Promise.all([doClone1(), doClone2()]).then(function(){
+	if (typeof window !== "undefined" && window.assert) {
+		assert.ok(true, "promises resolved");
+		done();
+	} else {
+		console.log("worked");
+	}
+}, function(){
+	if (typeof window !== "undefined" && window.assert) {
+		assert.ok(false, "promises failed");
+		done();
+	} else {
+		console.log("promises failed");
+	}
+});
diff --git a/test/steal_clone_test.js b/test/steal_clone_test.js
@@ -49,3 +49,8 @@ QUnit.test("works when using relative overrides", function(assert) {
 QUnit.test("what happens within a cloned loader should not leak", function(assert) {
 	makeIframe("ext-steal-clone/leak/index.html", assert);
 });
+
+
+QUnit.test("multiple clones can work at different paths", function(assert) {
+	makeIframe("ext-steal-clone/multiple/index.html", assert);
+});