fixed dll test cases

sokra · sokra · commit bb9d307b2e5f · 2016-09-21T17:26:25.000+02:00
diff --git a/test/ConfigTestCases.test.js b/test/ConfigTestCases.test.js
@@ -62,18 +62,18 @@ describe("ConfigTestCases", function() {
 							console: console
 						};
 
-						function _require(module) {
+						function _require(currentDirectory, module) {
 							if(Array.isArray(module) || /^\.\.?\//.test(module)) {
 								var fn;
 								var content;
 								if(Array.isArray(module)) {
-									var p = path.join(outputDirectory, module[0]);
+									var p = path.join(currentDirectory, module[0]);
 									content = module.map(function(p) {
-										var p = path.join(outputDirectory, p);
+										var p = path.join(currentDirectory, p);
 										return fs.readFileSync(p, "utf-8");
 									}).join("\n");
 								} else {
-									var p = path.join(outputDirectory, module);
+									var p = path.join(currentDirectory, module);
 									content = fs.readFileSync(p, "utf-8");
 								}
 								if(options.target === "web") {
@@ -84,7 +84,7 @@ describe("ConfigTestCases", function() {
 								var module = {
 									exports: {}
 								};
-								fn.call(module.exports, _require, module, module.exports, outputDirectory, p, _it, globalContext);
+								fn.call(module.exports, _require.bind(null, path.dirname(p)), module, module.exports, path.dirname(p), p, _it, globalContext);
 								return module.exports;
 							} else if(testConfig.modules && module in testConfig.modules) {
 								return testConfig.modules[module];
@@ -108,7 +108,7 @@ describe("ConfigTestCases", function() {
 							var bundlePath = testConfig.findBundle(i, optionsArr[i]);
 							if(bundlePath) {
 								filesCount++;
-								_require(bundlePath);
+								_require(outputDirectory, bundlePath);
 							}
 						}
 						// give a free pass to compilation that generated an error
diff --git a/test/configCases/dll-plugin/0-create-dll/b.js b/test/configCases/dll-plugin/0-create-dll/b.js
@@ -1,3 +1,3 @@
 module.exports = function() {
 	return System.import("./c");
-}
+}
diff --git a/test/configCases/dll-plugin/1-use-dll/index.js b/test/configCases/dll-plugin/1-use-dll/index.js
@@ -11,10 +11,11 @@ it("should load a module of non-default type without extension from dll", functi
 	require("dll/f").should.be.eql("f");
 });
 
-it("should load an async module from dll", function() {
+it("should load an async module from dll", function(done) {
 	require("dll/b")().then(function(c) {
 		c.should.be.eql({ default: "c" });
-	});
+		done();
+	}).catch(done);
 });
 
 it("should load an harmony module from dll (default export)", function() {
diff --git a/test/configCases/dll-plugin/2-use-dll-without-scope/index.js b/test/configCases/dll-plugin/2-use-dll-without-scope/index.js
@@ -7,10 +7,11 @@ it("should load a module from dll", function() {
 	require("../0-create-dll/a").should.be.eql("a");
 });
 
-it("should load an async module from dll", function() {
+it("should load an async module from dll", function(done) {
 	require("../0-create-dll/b")().then(function(c) {
 		c.should.be.eql({ default: "c" });
-	});
+		done();
+	}).catch(done);
 });
 
 it("should load an harmony module from dll (default export)", function() {

-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 module.exports = function() {
 	return System.import("./c");
 -}
 +}