Skip to content

Commit 9bd10b3

Browse files
juergbajuergba
committed
extend existing tests, additional tests
1 parent 434e823 commit 9bd10b3

7 files changed

+164
-52
lines changed

‎test/integration/fixtures/hooks/beforeEach-async-deepnested-error.fixture.js

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
'use strict';
2+
3+
describe('spec 1', function () {
4+
it('should run test-1', function () { });
5+
6+
describe('nested spec 2', function () {
7+
beforeEach(function (done) {
8+
process.nextTick(function () {
9+
throw new Error('before each hook error');
10+
});
11+
});
12+
it('should not run nested test-2', function () { });
13+
14+
describe('deepnested spec 3', function () {
15+
it('should not run deepnested test-3', function () { });
16+
});
17+
});
18+
});

‎test/integration/fixtures/hooks/beforeEach-async-error.fixture.js

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
'use strict';
2+
3+
describe('spec 1', function () {
4+
beforeEach(function (done) {
5+
process.nextTick(function () {
6+
throw new Error('before each hook error');
7+
});
8+
});
9+
it('should not run test-1', function () { });
10+
it('should not run test-2', function () { });
11+
});
12+
13+
describe('spec 2', function () {
14+
it('should run test-3', function () { });
15+
});

‎test/integration/fixtures/hooks/beforeEach-deepnested-error.fixture.js

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
'use strict';
2+
3+
describe('spec 1', function () {
4+
it('should run test-1', function () { });
5+
6+
describe('nested spec 2', function () {
7+
beforeEach(function() {
8+
throw new Error('before each hook error');
9+
});
10+
it('should not run nested test-2', function () { });
11+
12+
describe('deepnested spec 3', function () {
13+
it('should not run deepnested test-3', function () { });
14+
});
15+
});
16+
});

‎test/integration/fixtures/hooks/beforeEach-error.fixture.js

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
'use strict';
2+
3+
describe('spec 1', function () {
4+
beforeEach(function () {
5+
throw new Error('before each hook error');
6+
});
7+
it('should not run test-1', function () { });
8+
it('should not run test-2', function () { });
9+
});
10+
11+
describe('spec 2', function () {
12+
it('should run test-3', function () { });
13+
});

‎test/integration/fixtures/hooks/beforeEach-hook-async-error.fixture.js

-21
This file was deleted.

‎test/integration/fixtures/hooks/beforeEach-hook-error.fixture.js

-19
This file was deleted.

‎test/integration/hook-err.spec.js

+102-12
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,58 @@ describe('hook error handling', function() {
116116
});
117117
});
118118
});
119+
120+
describe('in before each', function() {
121+
it('before each hook error', function(done) {
122+
var fixture = 'hooks/beforeEach-error.fixture.js';
123+
runMochaJSON(fixture, [], function(err, res) {
124+
if (err) {
125+
return done(err);
126+
}
127+
expect(res, 'to have failed with error', 'before each hook error')
128+
.and('to have test count', 3)
129+
.and('to have passed test count', 1)
130+
.and('to have skipped test count', 2)
131+
.and('to have failed test count', 1)
132+
.and('to have passed test', 'should run test-3')
133+
.and(
134+
'to have skipped test order',
135+
'should not run test-1',
136+
'should not run test-2'
137+
)
138+
.and(
139+
'to have failed test',
140+
'"before each" hook for "should not run test-1"'
141+
);
142+
done();
143+
});
144+
});
145+
146+
it('before each hook deepnested error', function(done) {
147+
var fixture = 'hooks/beforeEach-deepnested-error.fixture.js';
148+
runMochaJSON(fixture, [], function(err, res) {
149+
if (err) {
150+
return done(err);
151+
}
152+
expect(res, 'to have failed with error', 'before each hook error')
153+
.and('to have test count', 3)
154+
.and('to have passed test count', 1)
155+
.and('to have skipped test count', 2)
156+
.and('to have failed test count', 1)
157+
.and('to have passed test', 'should run test-1')
158+
.and(
159+
'to have skipped test order',
160+
'should not run nested test-2',
161+
'should not run deepnested test-3'
162+
)
163+
.and(
164+
'to have failed test',
165+
'"before each" hook for "should not run nested test-2"'
166+
);
167+
done();
168+
});
169+
});
170+
});
119171
});
120172

121173
describe('asynchronous hook', function() {
@@ -166,12 +218,57 @@ describe('hook error handling', function() {
166218
});
167219
});
168220
});
169-
});
170221

171-
describe('before each hook error', function() {
172-
before(run('hooks/beforeEach-hook-error.fixture.js'));
173-
it('should verify results', function() {
174-
expect(lines, 'to equal', ['before', bang + 'test 3']);
222+
describe('in before each', function() {
223+
it('before each hook error', function(done) {
224+
var fixture = 'hooks/beforeEach-async-error.fixture.js';
225+
runMochaJSON(fixture, [], function(err, res) {
226+
if (err) {
227+
return done(err);
228+
}
229+
expect(res, 'to have failed with error', 'before each hook error')
230+
.and('to have test count', 3)
231+
.and('to have passed test count', 1)
232+
.and('to have skipped test count', 2)
233+
.and('to have failed test count', 1)
234+
.and('to have passed test', 'should run test-3')
235+
.and(
236+
'to have skipped test order',
237+
'should not run test-1',
238+
'should not run test-2'
239+
)
240+
.and(
241+
'to have failed test',
242+
'"before each" hook for "should not run test-1"'
243+
);
244+
done();
245+
});
246+
});
247+
248+
it('before each hook deepnested error', function(done) {
249+
var fixture = 'hooks/beforeEach-async-deepnested-error.fixture.js';
250+
runMochaJSON(fixture, [], function(err, res) {
251+
if (err) {
252+
return done(err);
253+
}
254+
expect(res, 'to have failed with error', 'before each hook error')
255+
.and('to have test count', 3)
256+
.and('to have passed test count', 1)
257+
.and('to have skipped test count', 2)
258+
.and('to have failed test count', 1)
259+
.and('to have passed test', 'should run test-1')
260+
.and(
261+
'to have skipped test order',
262+
'should not run nested test-2',
263+
'should not run deepnested test-3'
264+
)
265+
.and(
266+
'to have failed test',
267+
'"before each" hook for "should not run nested test-2"'
268+
);
269+
done();
270+
});
271+
});
175272
});
176273
});
177274

@@ -271,13 +368,6 @@ describe('hook error handling', function() {
271368
});
272369
});
273370

274-
describe('async - before each hook error', function() {
275-
before(run('hooks/beforeEach-hook-async-error.fixture.js'));
276-
it('should verify results', function() {
277-
expect(lines, 'to equal', ['before', bang + 'test 3']);
278-
});
279-
});
280-
281371
describe('async - after hook error', function() {
282372
before(run('hooks/after-hook-async-error.fixture.js'));
283373
it('should verify results', function() {

0 commit comments

Comments
 (0)