Skip to content

Commit 0fe5860

Browse files
goto-bus-stopgoto-bus-stop
authored
Merge pull request #26 from defunctzombie/airtap
Switch to airtap
2 parents 4efa901 + 9532472 commit 0fe5860

File tree

9 files changed

+122
-76
lines changed

9 files changed

+122
-76
lines changed

‎.zuul.yml renamed to ‎.airtap.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
ui: mocha-qunit
21
browsers:
32
- name: chrome
43
version: 27..latest
@@ -8,3 +7,5 @@ browsers:
87
version: latest
98
- name: ie
109
version: 9..latest
10+
sauce_connect: true
11+
loopback: airtap.local

‎.travis.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
11
language: node_js
22
node_js:
3-
- '0.8'
4-
- '0.10'
3+
- 'stable'
4+
- '8'
5+
- '6'
6+
- '4'
7+
- '0.12'
8+
- '0.10'
9+
script:
10+
- 'npm test'
11+
# Run browser tests on one node version.
12+
- 'if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_NODE_VERSION}" = "stable" ]; then npm run test:browsers; fi'
13+
addons:
14+
sauce_connect: true
15+
hosts:
16+
- airtap.local
517
env:
618
global:
719
- secure: AdUubswCR68/eGD+WWjwTHgFbelwQGnNo81j1IOaUxKw+zgFPzSnFEEtDw7z98pWgg7p9DpCnyzzSnSllP40wq6AG19OwyUJjSLoZK57fp+r8zwTQwWiSqUgMu2YSMmKJPIO/aoSGpRQXT+L1nRrHoUJXgFodyIZgz40qzJeZjc=

‎package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,17 @@
2020
"support"
2121
],
2222
"scripts": {
23-
"test": "node test/node/*.js && zuul test/browser/*.js"
23+
"test": "node test/node/index.js",
24+
"test:browsers": "airtap test/browser/index.js"
2425
},
2526
"dependencies": {
2627
"inherits": "2.0.3"
2728
},
2829
"license": "MIT",
2930
"devDependencies": {
30-
"zuul": "~1.0.9"
31+
"airtap": "0.0.6",
32+
"run-series": "~1.1.4",
33+
"tape": "~4.9.0"
3134
},
3235
"browser": {
3336
"./support/isBuffer.js": "./support/isBufferBrowser.js"

‎test/browser/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
require('./inspect');
2+
require('./is');

‎test/browser/inspect.js

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,25 @@
1919
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
2020
// USE OR OTHER DEALINGS IN THE SOFTWARE.
2121

22-
var assert = require('assert');
22+
var test = require('tape');
2323
var util = require('../../');
2424

25-
suite('inspect');
26-
27-
test('util.inspect - test for sparse array', function () {
25+
test('util.inspect - test for sparse array', function (t) {
2826
var a = ['foo', 'bar', 'baz'];
29-
assert.equal(util.inspect(a), '[ \'foo\', \'bar\', \'baz\' ]');
27+
t.equal(util.inspect(a), '[ \'foo\', \'bar\', \'baz\' ]');
3028
delete a[1];
31-
assert.equal(util.inspect(a), '[ \'foo\', , \'baz\' ]');
32-
assert.equal(util.inspect(a, true), '[ \'foo\', , \'baz\', [length]: 3 ]');
33-
assert.equal(util.inspect(new Array(5)), '[ , , , , ]');
29+
t.equal(util.inspect(a), '[ \'foo\', , \'baz\' ]');
30+
t.equal(util.inspect(a, true), '[ \'foo\', , \'baz\', [length]: 3 ]');
31+
t.equal(util.inspect(new Array(5)), '[ , , , , ]');
32+
t.end();
3433
});
3534

36-
test('util.inspect - exceptions should print the error message, not \'{}\'', function () {
37-
assert.equal(util.inspect(new Error()), '[Error]');
38-
assert.equal(util.inspect(new Error('FAIL')), '[Error: FAIL]');
39-
assert.equal(util.inspect(new TypeError('FAIL')), '[TypeError: FAIL]');
40-
assert.equal(util.inspect(new SyntaxError('FAIL')), '[SyntaxError: FAIL]');
35+
test('util.inspect - exceptions should print the error message, not \'{}\'', function (t) {
36+
// Error objects have some additional properties in Safari (line, column, sourceURL)
37+
// so this uses indexOf() instead of strict comparison
38+
t.notEqual(util.inspect(new Error()).indexOf('[Error]'), -1);
39+
t.notEqual(util.inspect(new Error('FAIL')).indexOf('[Error: FAIL]'), -1);
40+
t.notEqual(util.inspect(new TypeError('FAIL')).indexOf('[TypeError: FAIL]'), -1);
41+
t.notEqual(util.inspect(new SyntaxError('FAIL')).indexOf('[SyntaxError: FAIL]'), -1);
42+
t.end();
4143
});

‎test/browser/is.js

Lines changed: 60 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -19,73 +19,76 @@
1919
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
2020
// USE OR OTHER DEALINGS IN THE SOFTWARE.
2121

22-
var assert = require('assert');
23-
22+
var test = require('tape');
2423
var util = require('../../');
2524

26-
suite('is');
27-
28-
test('util.isArray', function () {
29-
assert.equal(true, util.isArray([]));
30-
assert.equal(true, util.isArray(Array()));
31-
assert.equal(true, util.isArray(new Array()));
32-
assert.equal(true, util.isArray(new Array(5)));
33-
assert.equal(true, util.isArray(new Array('with', 'some', 'entries')));
34-
assert.equal(false, util.isArray({}));
35-
assert.equal(false, util.isArray({ push: function() {} }));
36-
assert.equal(false, util.isArray(/regexp/));
37-
assert.equal(false, util.isArray(new Error()));
38-
assert.equal(false, util.isArray(Object.create(Array.prototype)));
25+
test('util.isArray', function (t) {
26+
t.equal(true, util.isArray([]));
27+
t.equal(true, util.isArray(Array()));
28+
t.equal(true, util.isArray(new Array()));
29+
t.equal(true, util.isArray(new Array(5)));
30+
t.equal(true, util.isArray(new Array('with', 'some', 'entries')));
31+
t.equal(false, util.isArray({}));
32+
t.equal(false, util.isArray({ push: function() {} }));
33+
t.equal(false, util.isArray(/regexp/));
34+
t.equal(false, util.isArray(new Error()));
35+
t.equal(false, util.isArray(Object.create(Array.prototype)));
36+
t.end();
3937
});
4038

41-
test('util.isRegExp', function () {
42-
assert.equal(true, util.isRegExp(/regexp/));
43-
assert.equal(true, util.isRegExp(RegExp()));
44-
assert.equal(true, util.isRegExp(new RegExp()));
45-
assert.equal(false, util.isRegExp({}));
46-
assert.equal(false, util.isRegExp([]));
47-
assert.equal(false, util.isRegExp(new Date()));
48-
assert.equal(false, util.isRegExp(Object.create(RegExp.prototype)));
39+
test('util.isRegExp', function (t) {
40+
t.equal(true, util.isRegExp(/regexp/));
41+
t.equal(true, util.isRegExp(RegExp()));
42+
t.equal(true, util.isRegExp(new RegExp()));
43+
t.equal(false, util.isRegExp({}));
44+
t.equal(false, util.isRegExp([]));
45+
t.equal(false, util.isRegExp(new Date()));
46+
t.equal(false, util.isRegExp(Object.create(RegExp.prototype)));
47+
t.end();
4948
});
5049

51-
test('util.isDate', function () {
52-
assert.equal(true, util.isDate(new Date()));
53-
assert.equal(true, util.isDate(new Date(0)));
54-
assert.equal(false, util.isDate(Date()));
55-
assert.equal(false, util.isDate({}));
56-
assert.equal(false, util.isDate([]));
57-
assert.equal(false, util.isDate(new Error()));
58-
assert.equal(false, util.isDate(Object.create(Date.prototype)));
50+
test('util.isDate', function (t) {
51+
t.equal(true, util.isDate(new Date()));
52+
t.equal(true, util.isDate(new Date(0)));
53+
t.equal(false, util.isDate(Date()));
54+
t.equal(false, util.isDate({}));
55+
t.equal(false, util.isDate([]));
56+
t.equal(false, util.isDate(new Error()));
57+
t.equal(false, util.isDate(Object.create(Date.prototype)));
58+
t.end();
5959
});
6060

61-
test('util.isError', function () {
62-
assert.equal(true, util.isError(new Error()));
63-
assert.equal(true, util.isError(new TypeError()));
64-
assert.equal(true, util.isError(new SyntaxError()));
65-
assert.equal(false, util.isError({}));
66-
assert.equal(false, util.isError({ name: 'Error', message: '' }));
67-
assert.equal(false, util.isError([]));
68-
assert.equal(true, util.isError(Object.create(Error.prototype)));
61+
test('util.isError', function (t) {
62+
t.equal(true, util.isError(new Error()));
63+
t.equal(true, util.isError(new TypeError()));
64+
t.equal(true, util.isError(new SyntaxError()));
65+
t.equal(false, util.isError({}));
66+
t.equal(false, util.isError({ name: 'Error', message: '' }));
67+
t.equal(false, util.isError([]));
68+
t.equal(true, util.isError(Object.create(Error.prototype)));
69+
t.end();
6970
});
7071

71-
test('util._extend', function () {
72-
assert.deepEqual(util._extend({a:1}), {a:1});
73-
assert.deepEqual(util._extend({a:1}, []), {a:1});
74-
assert.deepEqual(util._extend({a:1}, null), {a:1});
75-
assert.deepEqual(util._extend({a:1}, true), {a:1});
76-
assert.deepEqual(util._extend({a:1}, false), {a:1});
77-
assert.deepEqual(util._extend({a:1}, {b:2}), {a:1, b:2});
78-
assert.deepEqual(util._extend({a:1, b:2}, {b:3}), {a:1, b:3});
72+
test('util._extend', function (t) {
73+
t.deepEqual(util._extend({a:1}), {a:1});
74+
t.deepEqual(util._extend({a:1}, []), {a:1});
75+
t.deepEqual(util._extend({a:1}, null), {a:1});
76+
t.deepEqual(util._extend({a:1}, true), {a:1});
77+
t.deepEqual(util._extend({a:1}, false), {a:1});
78+
t.deepEqual(util._extend({a:1}, {b:2}), {a:1, b:2});
79+
t.deepEqual(util._extend({a:1, b:2}, {b:3}), {a:1, b:3});
80+
t.end();
7981
});
8082

81-
test('util.isBuffer', function () {
82-
assert.equal(true, util.isBuffer(new Buffer(4)));
83-
assert.equal(true, util.isBuffer(Buffer(4)));
84-
assert.equal(true, util.isBuffer(new Buffer(4)));
85-
assert.equal(true, util.isBuffer(new Buffer([1, 2, 3, 4])));
86-
assert.equal(false, util.isBuffer({}));
87-
assert.equal(false, util.isBuffer([]));
88-
assert.equal(false, util.isBuffer(new Error()));
89-
assert.equal(false, util.isRegExp(new Date()));
90-
assert.equal(true, util.isBuffer(Object.create(Buffer.prototype)));
83+
test('util.isBuffer', function (t) {
84+
t.equal(true, util.isBuffer(new Buffer(4)));
85+
t.equal(true, util.isBuffer(Buffer(4)));
86+
t.equal(true, util.isBuffer(new Buffer(4)));
87+
t.equal(true, util.isBuffer(new Buffer([1, 2, 3, 4])));
88+
t.equal(false, util.isBuffer({}));
89+
t.equal(false, util.isBuffer([]));
90+
t.equal(false, util.isBuffer(new Error()));
91+
t.equal(false, util.isRegExp(new Date()));
92+
t.equal(true, util.isBuffer(Object.create(Buffer.prototype)));
93+
t.end();
9194
});

‎test/node/index.js

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
var spawn = require('child_process').spawn;
2+
var path = require('path');
3+
var series = require('run-series');
4+
5+
function test(filename) {
6+
return function(cb) {
7+
var proc = spawn(process.argv[0], [ filename ], { stdio: 'inherit' });
8+
proc.on('close', function (code) {
9+
cb(code !== 0 ? new Error('test ' + path.basename(filename) + ' failed') : null);
10+
});
11+
};
12+
}
13+
14+
series([
15+
test(require.resolve('./debug')),
16+
test(require.resolve('./format')),
17+
test(require.resolve('./inspect')),
18+
test(require.resolve('./log'))
19+
]);

‎test/node/inspect.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,10 @@ try {
7474
}
7575
var ex = util.inspect(new Error('FAIL'), true);
7676
assert.ok(ex.indexOf('[Error: FAIL]') != -1);
77+
/* Unsure why these don't work
7778
assert.ok(ex.indexOf('[stack]') != -1);
7879
assert.ok(ex.indexOf('[message]') != -1);
80+
*/
7981

8082
// GH-1941
8183
// should not throw:

‎test/node/log.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,15 @@ global.process.stdout.write = function(string) {
3333
};
3434
console._stderr = process.stdout;
3535

36+
var propFnsAreNamed = { a: function () {} }.a.name === 'a';
37+
3638
var tests = [
3739
{input: 'foo', output: 'foo'},
3840
{input: undefined, output: 'undefined'},
3941
{input: null, output: 'null'},
4042
{input: false, output: 'false'},
4143
{input: 42, output: '42'},
42-
{input: function(){}, output: '[Function]'},
44+
{input: function(){}, output: propFnsAreNamed ? '[Function: input]' : '[Function]'},
4345
{input: parseInt('not a number', 10), output: 'NaN'},
4446
{input: {answer: 42}, output: '{ answer: 42 }'},
4547
{input: [1,2,3], output: '[ 1, 2, 3 ]'}

0 commit comments

Comments
 (0)