fix for tests.

Author: fahad19

lib/loader.js

@@ -30,6 +30,10 @@ module.exports = function(content, map) {
 		externals = givenExternals;
 	}
 
+	if (typeof externals === 'string') {
+		externals = JSON.parse(externals);
+	}
+
 	var externalsKeys = Object.keys(externals);
 
 	function findExternalFromImportUrl(importUrl) {
@@ -125,7 +129,6 @@ module.exports = function(content, map) {
 			}.bind(this));
 		}
 
-
 		var exportJs = compileExports(result, importItemMatcher.bind(this), camelCaseKeys);
 		if (exportJs) {
 			exportJs = "exports.locals = " + exportJs + ";";

test/externalsTest.js

@@ -1,4 +1,4 @@
-/*globals describe */
+/*globals describe, before, after */
 
 var test = require("./helpers").test;
 
@@ -10,10 +10,8 @@ function testLocal(name, input, result, localsResult, query, modules) {
 describe("externals", function() {
 	before(function () {
 		global.External = {
-			External: {
-				c2: "imported-c2",
-				c4: "imported-c4"
-			}
+			c2: "imported-c2",
+			c4: "imported-c4"
 		};
 	});
 
@@ -30,18 +28,14 @@ describe("externals", function() {
 
 		// result
 		[
-			[
-				2,
-				".test{c: d}",
-				""
-			],
 			[
 				1,
 				[
 					"._c1 { b: 1; }",
 					"._c3 { b: 3; }",
 					"._c5 { b: 5; }"
-				].join("\n"), ""]
+				].join("\n"), ""
+			]
 		],
 
 		// localsResult
@@ -52,12 +46,15 @@ describe("externals", function() {
 		},
 
 		// query
-		{
-			localIdentName: '[name]__[local]___[hash:base64:5]',
-			externals: {
-				external: 'External'
-			}
-		},
+		'?localIdentName=_[local]&externals={"external":"External"}',
+
+		// @TODO: test with query as an object too
+		// {
+		// 	localIdentName: '_[local]',
+		// 	externals: {
+		// 		external: 'External'
+		// 	}
+		// },
 
 		// modules
 		{}