Merge pull request #1753 from ndhoule/refactor/remove-dunderproto

Replace __proto__ references with inherits module
mochajs · Jul 5, 2015 · 2b2c576 · 2b2c576
2 parents 93d5a3a + 993d1eb
commit 2b2c576
Show file tree

Hide file tree

Showing 15 changed files with 60 additions and 33 deletions.
diff --git a/lib/hook.js b/lib/hook.js
@@ -3,6 +3,7 @@
  */
 
 var Runnable = require('./runnable');
+var create = require('lodash.create');
 
 /**
  * Expose `Hook`.
@@ -25,7 +26,10 @@ function Hook(title, fn) {
 /**
  * Inherit from `Runnable.prototype`.
  */
-Hook.prototype.__proto__ = Runnable.prototype;
+
+Hook.prototype = create(Runnable.prototype, {
+  constructor: Hook
+});
 
 /**
  * Get or set the test `err`.

diff --git a/lib/reporters/dot.js b/lib/reporters/dot.js
@@ -3,6 +3,7 @@
  */
 
 var Base = require('./base');
+var create = require('lodash.create');
 var color = Base.color;
 
 /**
@@ -63,4 +64,6 @@ function Dot(runner) {
  * Inherit from `Base.prototype`.
  */
 
-Dot.prototype.__proto__ = Base.prototype;
+Dot.prototype = create(Base.prototype, {
+  constructor: Dot
+});
diff --git a/lib/reporters/landing.js b/lib/reporters/landing.js
@@ -3,6 +3,7 @@
  */
 
 var Base = require('./base');
+var create = require('lodash.create');
 var cursor = Base.cursor;
 var color = Base.color;
 
@@ -89,4 +90,6 @@ function Landing(runner) {
  * Inherit from `Base.prototype`.
  */
 
-Landing.prototype.__proto__ = Base.prototype;
+Landing.prototype = create(Base.prototype, {
+  constructor: Landing
+});
diff --git a/lib/reporters/list.js b/lib/reporters/list.js
@@ -3,6 +3,7 @@
  */
 
 var Base = require('./base');
+var create = require('lodash.create');
 var color = Base.color;
 var cursor = Base.cursor;
 
@@ -58,4 +59,6 @@ function List(runner) {
  * Inherit from `Base.prototype`.
  */
 
-List.prototype.__proto__ = Base.prototype;
+List.prototype = create(Base.prototype, {
+  constructor: List
+});
diff --git a/lib/reporters/min.js b/lib/reporters/min.js
@@ -3,6 +3,7 @@
  */
 
 var Base = require('./base');
+var create = require('lodash.create');
 
 /**
  * Expose `Min`.
@@ -33,4 +34,6 @@ function Min(runner) {
  * Inherit from `Base.prototype`.
  */
 
-Min.prototype.__proto__ = Base.prototype;
+Min.prototype = create(Base.prototype, {
+  constructor: Min
+});
diff --git a/lib/reporters/nyan.js b/lib/reporters/nyan.js
@@ -3,6 +3,7 @@
  */
 
 var Base = require('./base');
+var create = require('lodash.create');
 
 /**
  * Expose `Dot`.
@@ -58,6 +59,14 @@ function NyanCat(runner) {
   });
 }
 
+/**
+ * Inherit from `Base.prototype`.
+ */
+
+NyanCat.prototype = create(Base.prototype, {
+  constructor: NyanCat
+});
+
 /**
  * Draw the nyan cat
  *
@@ -253,9 +262,3 @@ NyanCat.prototype.rainbowify = function(str) {
 function write(string) {
   process.stdout.write(string);
 }
-
-/**
- * Inherit from `Base.prototype`.
- */
-
-NyanCat.prototype.__proto__ = Base.prototype;
diff --git a/lib/reporters/progress.js b/lib/reporters/progress.js
@@ -3,6 +3,7 @@
  */
 
 var Base = require('./base');
+var create = require('lodash.create');
 var color = Base.color;
 var cursor = Base.cursor;
 
@@ -86,4 +87,6 @@ function Progress(runner, options) {
  * Inherit from `Base.prototype`.
  */
 
-Progress.prototype.__proto__ = Base.prototype;
+Progress.prototype = create(Base.prototype, {
+  constructor: Progress
+});
diff --git a/lib/reporters/spec.js b/lib/reporters/spec.js
@@ -3,6 +3,7 @@
  */
 
 var Base = require('./base');
+var create = require('lodash.create');
 var color = Base.color;
 var cursor = Base.cursor;
 
@@ -80,4 +81,6 @@ function Spec(runner) {
  * Inherit from `Base.prototype`.
  */
 
-Spec.prototype.__proto__ = Base.prototype;
+Spec.prototype = create(Base.prototype, {
+  constructor: Spec
+});
diff --git a/lib/reporters/xunit.js b/lib/reporters/xunit.js
@@ -3,6 +3,7 @@
  */
 
 var Base = require('./base');
+var create = require('lodash.create');
 var fs = require('fs');
 var escape = require('../utils').escape;
 
@@ -95,7 +96,9 @@ XUnit.prototype.done = function(failures, fn) {
  * Inherit from `Base.prototype`.
  */
 
-XUnit.prototype.__proto__ = Base.prototype;
+XUnit.prototype = create(Base.prototype, {
+  constructor: XUnit
+});
 
 /**
  * Write out the given line.

diff --git a/lib/runnable.js b/lib/runnable.js
@@ -4,6 +4,7 @@
 
 var EventEmitter = require('events').EventEmitter;
 var Pending = require('./pending');
+var create = require('lodash.create');
 var debug = require('debug')('mocha:runnable');
 var milliseconds = require('./ms');
 var utils = require('./utils');
@@ -55,7 +56,9 @@ function Runnable(title, fn) {
  * Inherit from `EventEmitter.prototype`.
  */
 
-Runnable.prototype.__proto__ = EventEmitter.prototype;
+Runnable.prototype = create(EventEmitter.prototype, {
+  constructor: Runnable
+});
 
 /**
  * Set & get timeout `ms`.

diff --git a/lib/runner.js b/lib/runner.js
@@ -4,6 +4,7 @@
 
 var EventEmitter = require('events').EventEmitter;
 var Pending = require('./pending');
+var create = require('lodash.create');
 var debug = require('debug')('mocha:runner');
 var filter = require('./utils').filter;
 var indexOf = require('./utils').indexOf;
@@ -86,7 +87,9 @@ Runner.immediately = global.setImmediate || process.nextTick;
  * Inherit from `EventEmitter.prototype`.
  */
 
-Runner.prototype.__proto__ = EventEmitter.prototype;
+Runner.prototype = create(EventEmitter.prototype, {
+  constructor: Runner
+});
 
 /**
  * Run tests with full titles matching `re`. Updates runner.total

diff --git a/lib/suite.js b/lib/suite.js
@@ -4,6 +4,7 @@
 
 var EventEmitter = require('events').EventEmitter;
 var Hook = require('./hook');
+var create = require('lodash.create');
 var debug = require('debug')('mocha:suite');
 var milliseconds = require('./ms');
 var utils = require('./utils');
@@ -66,7 +67,9 @@ function Suite(title, parentContext) {
  * Inherit from `EventEmitter.prototype`.
  */
 
-Suite.prototype.__proto__ = EventEmitter.prototype;
+Suite.prototype = create(EventEmitter.prototype, {
+  constructor: Suite
+});
 
 /**
  * Return a clone of this `Suite`.

diff --git a/lib/test.js b/lib/test.js
@@ -3,6 +3,7 @@
  */
 
 var Runnable = require('./runnable');
+var create = require('lodash.create');
 
 /**
  * Expose `Test`.
@@ -27,4 +28,6 @@ function Test(title, fn) {
  * Inherit from `Runnable.prototype`.
  */
 
-Test.prototype.__proto__ = Runnable.prototype;
+Test.prototype = create(Runnable.prototype, {
+  constructor: Test
+});
diff --git a/package.json b/package.json
@@ -282,6 +282,7 @@
     "glob": "3.2.3",
     "growl": "1.8.1",
     "jade": "0.26.3",
+    "lodash.create": "^3.1.1",
     "mkdirp": "0.5.0",
     "supports-color": "1.2.0"
   },

diff --git a/support/compile.js b/support/compile.js
@@ -33,7 +33,7 @@ args.forEach(function(file){
  */
 
 function parse(js) {
-  return parseRequires(parseInheritance(js));
+  return parseRequires(js);
 }
 
 /**
@@ -52,20 +52,6 @@ function parseRequires(js) {
     .replace(/require\('fs'\)/g                   , "require('browser/fs')");
 }
 
-/**
- * Parse __proto__.
- */
-
-function parseInheritance(js) {
-  return js
-    .replace(/^ *(\w+)\.prototype\.__proto__ * = *(\w+)\.prototype *;?/gm, function(_, child, parent){
-      return 'function F(){};\n'
-        + 'F.prototype = ' + parent + '.prototype;\n'
-        + child + '.prototype = new F;\n'
-        + child + '.prototype.constructor = '+ child + ';\n';
-    });
-}
-
 /**
  * Compile the files.
  */