Merge pull request #18 from dwittner/master

Fix for issue #342, Tests being skipped when extending Object.prototype
busterjs · Sep 10, 2013 · 2f4471e · 2f4471e
2 parents 321c57c + c70de06
commit 2f4471e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/lib/test-runner.js b/lib/test-runner.js
@@ -1,5 +1,6 @@
 ((typeof define === "function" && define.amd && function (m) {
-    define("buster-test/test-runner", ["bane", "when", "lodash", "async", "platform"], m);
+    define("buster-test/test-runner",
+        ["bane", "when", "lodash", "async", "platform"], m);
 }) || (typeof module === "object" &&
        typeof require === "function" && function (m) {
         require("./seedrandom");
@@ -140,14 +141,14 @@
     }
 
     function unsatiesfiedRequirements(context) {
-        var name, requirements = context.requiresSupportForAll || {};
+        var name, requirements = context.requiresSupportForAll;
         for (name in requirements) {
             if (!satiesfiesRequirement(requirements[name])) {
                 return [name];
             }
         }
         var unsatiesfied = [];
-        requirements = context.requiresSupportForAny || {};
+        requirements = context.requiresSupportForAny;
         for (name in requirements) {
             if (satiesfiesRequirement(requirements[name])) {
                 return [];
@@ -641,6 +642,8 @@
         }
     });
 
-    TestRunner.prototype.nextTick = nextTick || function (cb) { setTimeout(cb, 0); };
+    TestRunner.prototype.nextTick = nextTick ||
+        function (cb) { setTimeout(cb, 0); };
+
     return TestRunner.prototype;
 });
diff --git a/test/test-runner-test.js b/test/test-runner-test.js
@@ -2175,7 +2175,20 @@
             this.runSuite([context], done(function (listeners) {
                 assert(listeners["context:unsupported"].calledOnce);
             }));
-        }
+        },
+
+        "does not emit context:unsupported due to extended Object.prototype":
+             function (done) {
+                Object.prototype.mixin = function () {};
+
+                var context = testCase("Test", {
+                    "test": this.test
+                });
+
+                this.runSuite([context], done(function (listeners) {
+                    assert(listeners["context:unsupported"].notCalled);
+                }));
+            }
     });
 
     helper.testCase("TestRunnerEventDataTest", {