Merge pull request #33 from jbms/master

fix: handle "./.." case

Author: sokra

lib/normalize.js

@@ -33,9 +33,14 @@ module.exports = function normalize(path) {
 					// i. e. "a/../b/c" => "b/c"
 					// i. e. "/../b/c" => "/b/c"
 					// i. e. "C:\..\a\b\c" => "C:\a\b\c"
-					i += 1;
-					sep = !sep;
-					result.length = absolutePathStart;
+					if (result[0] !== ".") {
+						i += 1;
+						sep = !sep;
+						result.length = absolutePathStart;
+					} else {
+						result.length = 0;
+						result.push(part);
+					}
 					break;
 				case 4:
 					// i. e. "a/b/.." => "a"
@@ -88,7 +93,7 @@ module.exports = function normalize(path) {
 			result.push(part);
 		}
 	}
-	if(result.length === 1 && /^[A-Za-z]:$/.test(result))
+	if(result.length === 1 && /^[A-Za-z]:$/.test(result[0]))
 		return result[0] + "\\";
 	return result.join("");
 };

test/MemoryFileSystem.js

@@ -359,6 +359,11 @@ describe("normalize", function() {
 		fs.normalize("C:\\a\\b\\d\\..\\c\\..\\..").should.be.eql("C:\\a");
 		fs.normalize("C:\\a\\b\\d\\\\.\\\\.\\c\\.\\..").should.be.eql("C:\\a\\b\\d");
 		fs.normalize("\\\\remote-computer\\c$\\file").should.be.eql("\\\\remote-computer\\c$\\file");
+		fs.normalize("./../a").should.be.eql("../a");
+		fs.normalize("/a/./../b").should.be.eql("/b");
+		fs.normalize("/./../b").should.be.eql("/b");
+		fs.normalize("C:\\.\\..\\a").should.be.eql("C:\\a");
+		fs.normalize("C:\\a\\.\\..\\b").should.be.eql("C:\\b");
 	});
 });
 describe("pathToArray", function() {