Fix npm run test-native

paulmillr · Jan 14, 2015 · d8445f5 · d8445f5
1 parent 4dcea4c
commit d8445f5
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 22 deletions.
diff --git a/test/array.js b/test/array.js
@@ -1,6 +1,5 @@
 /*global describe, it, expect, require, beforeEach */
 
-var exported = require('../');
 
 var runArrayTests = function () {
   'use strict';
@@ -15,7 +14,8 @@ var runArrayTests = function () {
   describe('Array', function () {
     var list = [5, 10, 15, 20];
 
-    it('is on the exported object', function () {
+    (process.env.NO_ES6_SHIM ? it.skip : it)('is on the exported object', function () {
+      var exported = require('../');
       expect(exported.Array).to.equal(Array);
     });
 

diff --git a/test/collections.js b/test/collections.js
@@ -2,7 +2,6 @@
 
 // Big thanks to V8 folks for test ideas.
 // v8/test/mjsunit/harmony/collections.js
-var exported = require('../');
 
 var Assertion = expect().constructor;
 Assertion.addMethod('theSameSet', function (otherArray) {
@@ -56,7 +55,8 @@ describe('Collections', function () {
       map = null;
     });
 
-    it('is on the exported object', function () {
+    (process.env.NO_ES6_SHIM ? it.skip : it)('is on the exported object', function () {
+      var exported = require('../');
       expect(exported.Map).to.equal(Map);
     });
 
@@ -455,7 +455,8 @@ describe('Collections', function () {
       set = null;
     });
 
-    it('is on the exported object', function () {
+    (process.env.NO_ES6_SHIM ? it.skip : it)('is on the exported object', function () {
+      var exported = require('../');
       expect(exported.Set).to.equal(Set);
     });
 

diff --git a/test/math.js b/test/math.js
@@ -1,7 +1,5 @@
 /*global describe, it, expect, require */
 
-var exported = require('../');
-
 var Assertion = expect().constructor;
 Assertion.prototype.almostEqual = function (obj, precision) {
   'use strict';
@@ -22,7 +20,8 @@ var valueOfIsNaN = { valueOf: function () { 'use strict'; return NaN; } };
 var valueOfIsInfinity = { valueOf: function () { 'use strict'; return Infinity; } };
 
 describe('Math', function () {
-  it('is on the exported object', function () {
+  (process.env.NO_ES6_SHIM ? it.skip : it)('is on the exported object', function () {
+    var exported = require('../');
     expect(exported.Math).to.equal(Math);
   });
 

diff --git a/test/number.js b/test/number.js
@@ -1,7 +1,5 @@
 /*global describe, it, expect, require */
 
-var exported = require('../');
-
 describe('Number', function (undefined) {
   var integers = [5295, -5295, -9007199254740991, 9007199254740991, 0, -0];
   var nonIntegers = [-9007199254741992, 9007199254741992, 5.9];
@@ -32,7 +30,8 @@ describe('Number', function (undefined) {
     expect(item).to.equal(false);
   };
 
-  it('is on the exported object', function () {
+  (process.env.NO_ES6_SHIM ? it.skip : it)('is on the exported object', function () {
+    var exported = require('../');
     expect(exported.Number).to.equal(Number);
   });
 

diff --git a/test/object.js b/test/object.js
@@ -1,9 +1,8 @@
 /*global describe, it, expect, require */
 
-var exported = require('../');
-
 describe('Object', function (undefined) {
-  it('is on the exported object', function () {
+  (process.env.NO_ES6_SHIM ? it.skip : it)('is on the exported object', function () {
+    var exported = require('../');
     expect(exported.Object).to.equal(Object);
   });
 

diff --git a/test/promise.js b/test/promise.js
@@ -1,11 +1,11 @@
 /*global describe, it, expect, require, Promise */
 
 /* This file is for testing implementation regressions of Promises. */
-var exported = require('../');
 var hasOwn = Object.prototype.hasOwnProperty;
 
 describe('Promise', function () {
-  it('is on the exported object', function () {
+  (process.env.NO_ES6_SHIM ? it.skip : it)('is on the exported object', function () {
+    var exported = require('../');
     expect(exported.Promise).to.equal(Promise);
   });
 

diff --git a/test/promise/promises-aplus.js b/test/promise/promises-aplus.js
@@ -5,6 +5,10 @@
 describe('Promises/A+ Tests', function () {
   'use strict';
 
+  if (typeof Promise === 'undefined') {
+    return;
+  }
+
   require('promises-aplus-tests').mocha({
     // an adapter from es6 spec to Promises/A+
     deferred: function () {

diff --git a/test/promise/promises-es6.js b/test/promise/promises-es6.js
@@ -4,6 +4,10 @@
 (function () {
     'use strict';
 
+    if (typeof Promise === 'undefined') {
+      return;
+    }
+
     describe('Promises/ES6 Tests', function () {
 
         // an adapter that sets up global.Promise

diff --git a/test/regexp.js b/test/regexp.js
@@ -1,7 +1,5 @@
 /*global describe, it, xit, expect, require */
 
-var exported = require('../');
-
 var getRegexLiteral = function (stringRegex) {
   try {
     /*jshint evil: true */
@@ -11,7 +9,8 @@ var getRegexLiteral = function (stringRegex) {
 };
 
 describe('RegExp', function () {
-  it('is on the exported object', function () {
+  (process.env.NO_ES6_SHIM ? it.skip : it)('is on the exported object', function () {
+    var exported = require('../');
     expect(exported.RegExp).to.equal(RegExp);
   });
 

diff --git a/test/string.js b/test/string.js
@@ -1,7 +1,5 @@
 /*global describe, it, expect, require */
 
-var exported = require('../');
-
 var runStringTests = function () {
   'use strict';
   describe('String', function () {
@@ -15,7 +13,8 @@ var runStringTests = function () {
       expect(function () { return fn.apply(null); }).to['throw'](TypeError);
     };
 
-    it('is on the exported object', function () {
+    (process.env.NO_ES6_SHIM ? it.skip : it)('is on the exported object', function () {
+      var exported = require('../');
       expect(exported.String).to.equal(String);
     });