refactor(es6): Update RawModule to ES2015 syntax (webpack#3691)

nitishdayal · TheLarkInn · commit 24594b345a2e · 2017-01-06T08:23:29.000-06:00
* refactor(es6): Upgrade ModuleReason and ModuleTemplate to es6

* added RawModule tests
diff --git a/lib/RawModule.js b/lib/RawModule.js
@@ -2,47 +2,49 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var Module = require("./Module");
-var OriginalSource = require("webpack-sources").OriginalSource;
-var RawSource = require("webpack-sources").RawSource;
-
-function RawModule(source, identifier, readableIdentifier) {
-	Module.call(this);
-	this.sourceStr = source;
-	this.identifierStr = identifier || this.sourceStr;
-	this.readableIdentifierStr = readableIdentifier || this.identifierStr;
-	this.cacheable = true;
-	this.built = false;
+"use strict";
+
+const Module = require("./Module");
+const OriginalSource = require("webpack-sources").OriginalSource;
+const RawSource = require("webpack-sources").RawSource;
+
+module.exports = class RawModule extends Module {
+
+	constructor(source, identifier, readableIdentifier) {
+		super()
+		this.sourceStr = source;
+		this.identifierStr = identifier || this.sourceStr;
+		this.readableIdentifierStr = readableIdentifier || this.identifierStr;
+		this.cacheable = true;
+		this.built = false;
+	}
+
+	identifier() {
+		return this.identifierStr;
+	}
+
+	size() {
+		return this.sourceStr.length;
+	}
+
+	readableIdentifier(requestShortener) {
+		return requestShortener.shorten(this.readableIdentifierStr);
+	}
+
+	needRebuild() {
+		return false;
+	}
+
+	build(options, compilations, resolver, fs, callback) {
+		this.builtTime = new Date().getTime();
+		callback();
+	}
+
+	source() {
+		if(this.useSourceMap)
+			return new OriginalSource(this.sourceStr, this.identifier());
+		else
+			return new RawSource(this.sourceStr);
+	}
+
 }
-module.exports = RawModule;
-
-RawModule.prototype = Object.create(Module.prototype);
-RawModule.prototype.constructor = RawModule;
-
-RawModule.prototype.identifier = function() {
-	return this.identifierStr;
-};
-
-RawModule.prototype.readableIdentifier = function(requestShortener) {
-	return requestShortener.shorten(this.readableIdentifierStr);
-};
-
-RawModule.prototype.needRebuild = function() {
-	return false;
-};
-
-RawModule.prototype.build = function(options, compilation, resolver, fs, callback) {
-	this.builtTime = new Date().getTime();
-	callback();
-};
-
-RawModule.prototype.source = function() {
-	if(this.useSourceMap)
-		return new OriginalSource(this.sourceStr, this.identifier());
-	else
-		return new RawSource(this.sourceStr);
-};
-
-RawModule.prototype.size = function() {
-	return this.sourceStr.length;
-};
diff --git a/test/RawModule.test.js b/test/RawModule.test.js
@@ -0,0 +1,71 @@
+var RawModule = require("../lib/RawModule");
+var OriginalSource = require("webpack-sources").OriginalSource;
+var RawSource = require("webpack-sources").RawSource;
+var RequestShortener = require("../lib/RequestShortener");
+var should = require("should");
+var path = require("path")
+
+describe("RawModule", function() {
+	var myRawModule;
+
+	before(function() {
+		var source = 'sourceStr attribute';
+		var identifier = 'identifierStr attribute';
+		var readableIdentifier = 'readableIdentifierStr attribute';
+		myRawModule = new RawModule(source, identifier, readableIdentifier);
+	});
+
+	describe('identifier', function() {
+		it('returns value for identifierStr attribute', function() {
+			should(myRawModule.identifier()).be.exactly('identifierStr attribute');
+		});
+	});
+
+	describe('size', function() {
+		it('returns value for sourceStr attribute\'s length property', function() {
+			var sourceStrLength = myRawModule.sourceStr.length;
+			should(myRawModule.size()).be.exactly(sourceStrLength);
+		});
+	});
+
+	describe('readableIdentifier', function() {
+		it('returns result of calling provided requestShortener\'s shorten method\
+     on readableIdentifierStr attribute', function() {
+			var requestShortener = new RequestShortener(path.resolve());
+			should.exist(myRawModule.readableIdentifier(requestShortener));
+		});
+	});
+
+	describe('needRebuild', function() {
+		it('returns false', function() {
+			should(myRawModule.needRebuild()).be.false();
+		});
+	});
+
+	describe('build', function() {
+		it('sets builtTime attribute to current time value in milliseconds', function() {
+			myRawModule.build('', '', '', '', () => {
+				undefined
+			})
+			var currentTime = new Date().getTime();
+			myRawModule.builtTime.should.be.exactly(currentTime);
+		});
+	});
+
+	describe('source', function() {
+		it('returns a new OriginalSource instance with sourceStr attribute and\
+        return value of identifier() function provided as constructor arguments',
+			function() {
+				var originalSource = new OriginalSource(myRawModule.sourceStr, myRawModule.identifier());
+				myRawModule.useSourceMap = true;
+				myRawModule.source().should.match(originalSource);
+			});
+
+		it('returns a new RawSource instance with sourceStr attribute provided\
+        as constructor argument if useSourceMap is falsey', function() {
+			var rawSource = new RawSource(myRawModule.sourceStr);
+			myRawModule.useSourceMap = false;
+			myRawModule.source().should.match(rawSource);
+		});
+	});
+});
