more usefull, better tests

Author: sokra

.travis.yml

@@ -0,0 +1,4 @@
+language: node_js
+node_js:
+  - 0.6
+  - 0.8

index.js

@@ -5,20 +5,15 @@
 var csso = require("csso");
 module.exports = function(content) {
 	this.cacheable && this.cacheable();
-	var isRequireUrl = !this || !this.options || !this.options.css ||
-					typeof this.options.css.requireUrl === "string";
-	var requireUrl = this && this.options && this.options.css &&
-					this.options.css.requireUrl;
-	if(typeof requireUrl !== "string") requireUrl = "!file!";
 	var result = [];
 	var tree = csso.parse(content, "stylesheet");
-	if(this && this.minimize)
+	if(this && this.minimize) {
 		tree = csso.compress(tree);
-	tree = csso.cleanInfo(tree);
+		tree = csso.cleanInfo(tree);
+	}
 
 	var imports = extractImports(tree);
-	if(isRequireUrl)
-		annotateUrls(tree);
+	annotateUrls(tree);
 
 	imports.forEach(function(imp) {
 		if(imp.media.length > 0) {
@@ -31,15 +26,12 @@ module.exports = function(content) {
 	});
 
 	var css = JSON.stringify(csso.translate(tree));
-	if(isRequireUrl) {
-		var uriRegExp = /%CSSURL\[%(.*?)%\]CSSURL%/g;
-		css = css.replace(uriRegExp, function(str) {
-			match = /^%CSSURL\[%(.*?)%\]CSSURL%$/.exec(str);
-			var url = JSON.parse("\"" + match[1] + "\"");
-			return "\"+require(" + JSON.stringify(requireUrl + urlToRequire(url)) + ")+\"";
-		});
-
-	}
+	var uriRegExp = /%CSSURL\[%(.*?)%\]CSSURL%/g;
+	css = css.replace(uriRegExp, function(str) {
+		var match = /^%CSSURL\[%(.*?)%\]CSSURL%$/.exec(str);
+		var url = JSON.parse("\"" + match[1] + "\"");
+		return "\"+require(" + JSON.stringify(urlToRequire(url)) + ")+\"";
+	});
 	result.push(css);
 	return "module.exports =\n\t" + result.join(" +\n\t") + ";";
 }

package.json

@@ -1,16 +1,17 @@
 {
 	"name": "css-loader",
-	"version": "0.5.1",
+	"version": "0.5.2",
 	"author": "Tobias Koppers @sokra",
 	"description": "css loader module for webpack",
 	"dependencies": {
 		"csso": "1.3.x"
 	},
 	"devDependencies": {
-		"vows": "0.6.2"
+		"mocha": "1.8.x",
+		"should": "1.1.x"
 	},
 	"scripts": {
-		"test": "node node_modules/vows/bin/vows"
+		"test": "mocha --reporter spec"
 	},
 	"licenses": [
 		{

test/urlTest.js

@@ -0,0 +1,38 @@
+var should = require("should");
+var path = require("path");
+var cssLoader = require("../index.js");
+
+function test(name, input, result) {
+	it(name, function() {
+		var output = cssLoader(input);
+		output.should.be.eql("module.exports =\n\t" + result.join(" +\n\t") + ";");
+	});
+}
+
+function testMinimize(name, input, result) {
+	it(name, function() {
+		var output = cssLoader.call({minimize: true}, input);
+		output.should.be.eql("module.exports =\n\t" + result.join(" +\n\t") + ";");
+	});
+}
+
+describe("url", function() {
+	test("simple", ".class { a: b c d; }",
+					["\".class { a: b c d; }\""]);
+	test("simple2", ".class { a: b c d; }\n.two {}",
+					["\".class { a: b c d; }\\n.two {}\""]);
+	test("import", "@import url(test.css);\n.class { a: b c d; }",
+					["require("+JSON.stringify("!"+path.join(__dirname, "..", "index.js")+"!./test.css")+")",
+						"\"\\n.class { a: b c d; }\""]);
+	test("import with media", "@import url(~test/css) screen and print;\n.class { a: b c d; }",
+					["\"@media screen and print{\"",
+						"require("+JSON.stringify("!"+path.join(__dirname, "..", "index.js")+"!test/css")+")",
+						"\"}\"",
+						"\"\\n.class { a: b c d; }\""]);
+	test("background img", ".class { background: green url( \"img.png\" ) xyz }",
+					["\".class { background: green url( \"+require(\"./img.png\")+\" ) xyz }\""]);
+	test("background img 2", ".class { background: green url(~img/png ) url(aaa) xyz }",
+					["\".class { background: green url(\"+require(\"img/png\")+\" ) url(\"+require(\"./aaa\")+\") xyz }\""]);
+	testMinimize("minimized simple", ".class { a: b c d; }",
+					["\".class{a:b c d}\""]);
+});