Skip to content

Commit

Permalink
Fix bad merge
Browse files Browse the repository at this point in the history
  • Loading branch information
chinchiheather committed Dec 27, 2018
1 parent 7a17c9a commit de46662
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions test/integration/hook-err.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
var runMocha = require('./helpers').runMocha;
var splitRegExp = require('./helpers').splitRegExp;
var bang = require('../../lib/reporters/base').symbols.bang;
var assert = require('assert');

describe('hook error handling', function() {
var lines;
Expand All @@ -16,16 +17,11 @@ describe('hook error handling', function() {

describe('before hook error tip', function() {
before(run('hooks/before-hook-error-tip.fixture.js', onlyErrorTitle()));
<<<<<<< HEAD
it('should verify results', function() {
expect(lines, 'to equal', ['1) spec 2', '"before all" hook:']);
=======
it('should verify results', function () {
assert.deepEqual(
lines,
['1) spec 2', '"before all" hook for "skipped":']
);
>>>>>>> Update hook error tests so error tip & nested error are consistent
});
});

Expand Down

0 comments on commit de46662

Please sign in to comment.