Skip to content

Commit d165142

Browse files
fongandrewfongandrew
committed
Update tests to correctly reference (or ignore) at prop
1 parent b6f5aaf commit d165142

10 files changed

+52
-11
lines changed

‎test/circular-things.js

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ tap.test('circular test', function (assert) {
2020
+ ' {}\n'
2121
+ ' actual: |-\n'
2222
+ ' { circular: [Circular] }\n'
23+
+ ' at: Test.<anonymous> ($TEST/circular-things.js:$LINE:$COL)\n'
2324
+ ' stack: |-\n'
2425
+ ' Error: should be equal\n'
2526
+ ' [... stack stripped ...]\n'

‎test/common.js

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
var path = require('path');
12
var yaml = require('js-yaml');
23

34
module.exports.getDiag = function (body) {
@@ -7,10 +8,11 @@ module.exports.getDiag = function (body) {
78
return line.slice(2);
89
}).join('\n');
910

10-
// The stack trace will vary depending on where the code is run, so just
11-
// strip it out.
11+
// The stack trace and at variable will vary depending on where the code
12+
// is run, so just strip it out.
1213
var withStack = yaml.safeLoad(diag);
1314
delete withStack.stack;
15+
delete withStack.at;
1416
return withStack;
1517
}
1618

@@ -19,7 +21,8 @@ module.exports.getDiag = function (body) {
1921
// 1) The base checkout directory of tape might change. Because stack traces
2022
// include absolute paths, the stack traces will change depending on the
2123
// checkout path. We handle this by replacing the base test directory with a
22-
// placeholder $TEST variable.
24+
// placeholder $TEST variable and the package root with a placehodler
25+
// $TAPE variable.
2326
// 2) Line positions within the file might change. We handle this by replacing
2427
// line and column markers with placeholder $LINE and $COL "variables"
2528
// a) node 0.8 does not provide nested eval line numbers, so we remove them
@@ -34,8 +37,9 @@ module.exports.stripFullStack = function (output) {
3437
var m = line.match(/[ ]{8}at .*\((.*)\)/);
3538

3639
var stripChangingData = function (line) {
37-
var withoutDirectory = line.replace(__dirname, '$TEST');
38-
var withoutLineNumbers = withoutDirectory.replace(/:\d+:\d+/g, ':$LINE:$COL');
40+
var withoutTestDir = line.replace(__dirname, '$TEST');
41+
var withoutPackageDir = withoutTestDir.replace(path.dirname(__dirname), '$TAPE');
42+
var withoutLineNumbers = withoutPackageDir.replace(/:\d+:\d+/g, ':$LINE:$COL');
3943
var withoutNestedLineNumbers = withoutLineNumbers.replace(/, \<anonymous\>:\$LINE:\$COL\)$/, ')');
4044
return withoutNestedLineNumbers;
4145
}

‎test/deep-equal-failure.js

+6
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ tap.test('deep equal failure', function (assert) {
2626
+ ' { b: 2 }\n'
2727
+ ' actual: |-\n'
2828
+ ' { a: 1 }\n'
29+
+ ' at: Test.<anonymous> ($TEST/deep-equal-failure.js:$LINE:$COL)\n'
2930
+ ' stack: |-\n'
3031
+ ' Error: should be equal\n'
3132
+ ' [... stack stripped ...]\n'
@@ -48,6 +49,7 @@ tap.test('deep equal failure', function (assert) {
4849

4950
parser.once('assert', function (data) {
5051
delete data.diag.stack;
52+
delete data.diag.at;
5153
assert.deepEqual(data, {
5254
ok: false,
5355
id: 1,
@@ -85,6 +87,7 @@ tap.test('deep equal failure, depth 6, with option', function (assert) {
8587
+ ' { a: { a1: { a2: { a3: { a4: { a5: 2 } } } } } }\n'
8688
+ ' actual: |-\n'
8789
+ ' { a: { a1: { a2: { a3: { a4: { a5: 1 } } } } } }\n'
90+
+ ' at: Test.<anonymous> ($TEST/deep-equal-failure.js:$LINE:$COL)\n'
8891
+ ' stack: |-\n'
8992
+ ' Error: should be equal\n'
9093
+ ' [... stack stripped ...]\n'
@@ -107,6 +110,7 @@ tap.test('deep equal failure, depth 6, with option', function (assert) {
107110

108111
parser.once('assert', function (data) {
109112
delete data.diag.stack;
113+
delete data.diag.at;
110114
assert.deepEqual(data, {
111115
ok: false,
112116
id: 1,
@@ -144,6 +148,7 @@ tap.test('deep equal failure, depth 6, without option', function (assert) {
144148
+ ' { a: { a1: { a2: { a3: { a4: [Object] } } } } }\n'
145149
+ ' actual: |-\n'
146150
+ ' { a: { a1: { a2: { a3: { a4: [Object] } } } } }\n'
151+
+ ' at: Test.<anonymous> ($TEST/deep-equal-failure.js:$LINE:$COL)\n'
147152
+ ' stack: |-\n'
148153
+ ' Error: should be equal\n'
149154
+ ' [... stack stripped ...]\n'
@@ -166,6 +171,7 @@ tap.test('deep equal failure, depth 6, without option', function (assert) {
166171

167172
parser.once('assert', function (data) {
168173
delete data.diag.stack;
174+
delete data.diag.at;
169175
assert.deepEqual(data, {
170176
ok: false,
171177
id: 1,

‎test/double_end.js

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ test(function (t) {
4141
'not ok 2 .end() called twice',
4242
' ---',
4343
' operator: fail',
44+
' at: Timeout.doEnd [as _onTimeout] ($TEST/double_end/double.js:$LINE:$COL)',
4445
' stack: |-',
4546
' Error: .end() called twice',
4647
' [... stack stripped ...]',

‎test/exit.js

+3
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ tap.test('exit fail', function (t) {
5252
' operator: deepEqual',
5353
' expected: [ [ 1, 2, [ 3, 4444 ] ], [ 5, 6 ] ]',
5454
' actual: [ [ 1, 2, [ 3, 4 ] ], [ 5, 6 ] ]',
55+
' at: Test.<anonymous> ($TEST/exit/fail.js:$LINE:$COL)',
5556
' stack: |-',
5657
' Error: should be equivalent',
5758
' [... stack stripped ...]',
@@ -93,6 +94,7 @@ tap.test('too few exit', function (t) {
9394
' operator: fail',
9495
' expected: 6',
9596
' actual: 5',
97+
' at: process.<anonymous> ($TAPE/index.js:$LINE:$COL)',
9698
' stack: |-',
9799
' Error: plan != count',
98100
' [... stack stripped ...]',
@@ -127,6 +129,7 @@ tap.test('more planned in a second test', function (t) {
127129
' operator: fail',
128130
' expected: 2',
129131
' actual: 1',
132+
' at: process.<anonymous> ($TAPE/index.js:$LINE:$COL)',
130133
' stack: |-',
131134
' Error: plan != count',
132135
' [... stack stripped ...]',

‎test/fail.js

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ tap.test('array test', function (tt) {
2222
' operator: deepEqual',
2323
' expected: [ [ 1, 2, [ 3, 4444 ] ], [ 5, 6 ] ]',
2424
' actual: [ [ 1, 2, [ 3, 4 ] ], [ 5, 6 ] ]',
25+
' at: Test.<anonymous> ($TEST/fail.js:$LINE:$COL)',
2526
' stack: |-',
2627
' Error: should be equivalent',
2728
' [... stack stripped ...]',

‎test/stackTrace.js

+20-6
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ tap.test('preserves stack trace with newlines', function (tt) {
1313
var stackTrace = 'foo\n bar';
1414

1515
parser.once('assert', function (data) {
16+
delete data.diag.at;
1617
tt.deepEqual(data, {
1718
ok: false,
1819
id: 1,
@@ -27,7 +28,8 @@ tap.test('preserves stack trace with newlines', function (tt) {
2728
});
2829

2930
stream.pipe(concat(function (body) {
30-
var body = body.toString('utf8')
31+
var body = body.toString('utf8');
32+
body = stripAt(body);
3133
tt.equal(
3234
body,
3335
'TAP version 13\n'
@@ -67,22 +69,25 @@ tap.test('preserves stack trace with newlines', function (tt) {
6769
});
6870

6971
tap.test('preserves stack trace for failed assertions', function (tt) {
70-
tt.plan(5);
72+
tt.plan(6);
7173

7274
var test = tape.createHarness();
7375
var stream = test.createStream();
7476
var parser = stream.pipe(tapParser());
7577

7678
var stack = ''
7779
parser.once('assert', function (data) {
78-
tt.equal(typeof data.diag.stack, 'string')
79-
stack = data.diag.stack || ''
80+
tt.equal(typeof data.diag.at, 'string');
81+
tt.equal(typeof data.diag.stack, 'string');
82+
at = data.diag.at || '';
83+
stack = data.diag.stack || '';
8084
tt.ok(/^Error: false should be true(\n at .+)+/.exec(stack), 'stack should be a stack')
8185
tt.deepEqual(data, {
8286
ok: false,
8387
id: 1,
8488
name: "false should be true",
8589
diag: {
90+
at: at,
8691
stack: stack,
8792
operator: 'equal',
8893
expected: false,
@@ -92,7 +97,8 @@ tap.test('preserves stack trace for failed assertions', function (tt) {
9297
});
9398

9499
stream.pipe(concat(function (body) {
95-
var body = body.toString('utf8')
100+
var body = body.toString('utf8');
101+
body = stripAt(body);
96102
tt.equal(
97103
body,
98104
'TAP version 13\n'
@@ -134,5 +140,13 @@ function getDiag (body) {
134140
return line.slice(2);
135141
}).join('\n');
136142

137-
return yaml.safeLoad(diag);
143+
// Get rid of 'at' variable (which has a line number / path of its own that's
144+
// difficult to check).
145+
var withStack = yaml.safeLoad(diag);
146+
delete withStack.at;
147+
return withStack;
138148
}
149+
150+
function stripAt (body) {
151+
return body.replace(/^\s*at:\s+Test.*$\n/m, '');
152+
}

‎test/throws.js

+9
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ tap.test('failures', function (tt) {
4040
+ ' undefined\n'
4141
+ ' actual: |-\n'
4242
+ " { [TypeError: " + getNonFunctionMessage() + "] message: '" + getNonFunctionMessage() + "' }\n"
43+
+ ' at: Test.<anonymous> ($TEST/throws.js:$LINE:$COL)\n'
4344
+ ' stack: |-\n'
4445
+ ' TypeError: ' + getNonFunctionMessage(undefined) + '\n'
4546
+ ' [... stack stripped ...]\n'
@@ -53,6 +54,7 @@ tap.test('failures', function (tt) {
5354
+ ' undefined\n'
5455
+ ' actual: |-\n'
5556
+ " { [TypeError: " + getNonFunctionMessage(null) + "] message: '" + getNonFunctionMessage(null) + "' }\n"
57+
+ ' at: Test.<anonymous> ($TEST/throws.js:$LINE:$COL)\n'
5658
+ ' stack: |-\n'
5759
+ ' TypeError: ' + getNonFunctionMessage(null) + '\n'
5860
+ ' [... stack stripped ...]\n'
@@ -66,6 +68,7 @@ tap.test('failures', function (tt) {
6668
+ ' undefined\n'
6769
+ ' actual: |-\n'
6870
+ " { [TypeError: " + getNonFunctionMessage(true) + "] message: '" + getNonFunctionMessage(true) + "' }\n"
71+
+ ' at: Test.<anonymous> ($TEST/throws.js:$LINE:$COL)\n'
6972
+ ' stack: |-\n'
7073
+ ' TypeError: ' + getNonFunctionMessage(true) + '\n'
7174
+ ' [... stack stripped ...]\n'
@@ -79,6 +82,7 @@ tap.test('failures', function (tt) {
7982
+ ' undefined\n'
8083
+ ' actual: |-\n'
8184
+ " { [TypeError: " + getNonFunctionMessage(false) + "] message: '" + getNonFunctionMessage(false) + "' }\n"
85+
+ ' at: Test.<anonymous> ($TEST/throws.js:$LINE:$COL)\n'
8286
+ ' stack: |-\n'
8387
+ ' TypeError: ' + getNonFunctionMessage(false) + '\n'
8488
+ ' [... stack stripped ...]\n'
@@ -92,6 +96,7 @@ tap.test('failures', function (tt) {
9296
+ ' undefined\n'
9397
+ ' actual: |-\n'
9498
+ " { [TypeError: " + getNonFunctionMessage('abc') + "] message: '" + getNonFunctionMessage('abc') + "' }\n"
99+
+ ' at: Test.<anonymous> ($TEST/throws.js:$LINE:$COL)\n'
95100
+ ' stack: |-\n'
96101
+ ' TypeError: ' + getNonFunctionMessage('abc') + '\n'
97102
+ ' [... stack stripped ...]\n'
@@ -105,6 +110,7 @@ tap.test('failures', function (tt) {
105110
+ ' undefined\n'
106111
+ ' actual: |-\n'
107112
+ " { [TypeError: " + getNonFunctionMessage(/a/g) + "] message: '" + getNonFunctionMessage(/a/g) + "' }\n"
113+
+ ' at: Test.<anonymous> ($TEST/throws.js:$LINE:$COL)\n'
108114
+ ' stack: |-\n'
109115
+ ' TypeError: ' + getNonFunctionMessage(/a/g) + '\n'
110116
+ ' [... stack stripped ...]\n'
@@ -118,6 +124,7 @@ tap.test('failures', function (tt) {
118124
+ ' undefined\n'
119125
+ ' actual: |-\n'
120126
+ " { [TypeError: " + getNonFunctionMessage([]) + "] message: '" + getNonFunctionMessage([]) + "' }\n"
127+
+ ' at: Test.<anonymous> ($TEST/throws.js:$LINE:$COL)\n'
121128
+ ' stack: |-\n'
122129
+ ' TypeError: ' + getNonFunctionMessage([]) + '\n'
123130
+ ' [... stack stripped ...]\n'
@@ -131,6 +138,7 @@ tap.test('failures', function (tt) {
131138
+ ' undefined\n'
132139
+ ' actual: |-\n'
133140
+ " { [TypeError: " + getNonFunctionMessage({}) + "] message: '" + getNonFunctionMessage({}) + "' }\n"
141+
+ ' at: Test.<anonymous> ($TEST/throws.js:$LINE:$COL)\n'
134142
+ ' stack: |-\n'
135143
+ ' TypeError: ' + getNonFunctionMessage({}) + '\n'
136144
+ ' [... stack stripped ...]\n'
@@ -143,6 +151,7 @@ tap.test('failures', function (tt) {
143151
+ ' operator: throws\n'
144152
+ ' expected: undefined\n'
145153
+ ' actual: undefined\n'
154+
+ ' at: Test.<anonymous> ($TEST/throws.js:$LINE:$COL)\n'
146155
+ ' stack: |-\n'
147156
+ ' Error: should throw\n'
148157
+ ' [... stack stripped ...]\n'

‎test/too_many.js

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ tap.test('array test', function (tt) {
2222
' operator: fail',
2323
' expected: 3',
2424
' actual: 4',
25+
' at: Test.<anonymous> ($TEST/too_many.js:$LINE:$COL)',
2526
' stack: |-',
2627
' Error: plan != count',
2728
' [... stack stripped ...]',

‎test/undef.js

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ tap.test('array test', function (tt) {
2020
+ ' { beep: undefined }\n'
2121
+ ' actual: |-\n'
2222
+ ' {}\n'
23+
+ ' at: Test.<anonymous> ($TEST/undef.js:$LINE:$COL)\n'
2324
+ ' stack: |-\n'
2425
+ ' Error: should be equivalent\n'
2526
+ ' [... stack stripped ...]\n'

0 commit comments

Comments
 (0)