From dedf03de76cb9df31f48e143dbaf28aeaf955aec Mon Sep 17 00:00:00 2001 From: Christopher Hiller Date: Fri, 1 Jul 2016 22:38:27 -0700 Subject: [PATCH] fix integration tests with changes to dot reporter --- test/integration/hook.err.js | 37 ++++++++++++++++++------------------ test/integration/retries.js | 3 ++- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/test/integration/hook.err.js b/test/integration/hook.err.js index f874b8f3b6..5cdde133a9 100644 --- a/test/integration/hook.err.js +++ b/test/integration/hook.err.js @@ -1,6 +1,7 @@ var assert = require('assert'); var runMocha = require('./helpers').runMocha; var splitRegExp = require('./helpers').splitRegExp; +var bang = require('../../lib/reporters/base').symbols.bang; describe('hook error handling', function() { this.timeout(2000); @@ -12,7 +13,7 @@ describe('hook error handling', function() { it('should verify results', function() { assert.deepEqual( lines, - ['before', 'test 3'] + ['before', bang + 'test 3'] ); }); }); @@ -32,7 +33,7 @@ describe('hook error handling', function() { it('should verify results', function() { assert.deepEqual( lines, - ['before', 'test 3'] + ['before', bang + 'test 3'] ); }); }); @@ -42,7 +43,7 @@ describe('hook error handling', function() { it('should verify results', function() { assert.deepEqual( lines, - ['test 1', 'test 2', 'after', 'test 3'] + ['test 1', 'test 2', 'after', bang + 'test 3'] ); }); }); @@ -52,7 +53,7 @@ describe('hook error handling', function() { it('should verify results', function() { assert.deepEqual( lines, - ['test 1', 'after', 'test 3'] + ['test 1', 'after', bang + 'test 3'] ); }); }); @@ -68,25 +69,25 @@ describe('hook error handling', function() { 'root before each', '1 before each', '1-1 before each', - '1-1 after each', + bang + '1-1 after each', '1 after each', 'root after each', '1-1 after', - '1-2 before', + bang + '1-2 before', 'root before each', '1 before each', '1-2 before each', '1-2 test 1', '1-2 after each', - '1 after each', + bang + '1 after each', 'root after each', '1-2 after', '1 after', '2-1 before', 'root before each', '2 before each', - '2 after each', - 'root after each', + bang + '2 after each', + bang + 'root after each', '2-1 after', '2 after', 'root after' @@ -100,7 +101,7 @@ describe('hook error handling', function() { it('should verify results', function() { assert.deepEqual( lines, - ['before', 'test 3'] + ['before', bang + 'test 3'] ); }); }); @@ -120,7 +121,7 @@ describe('hook error handling', function() { it('should verify results', function() { assert.deepEqual( lines, - ['before', 'test 3'] + ['before', bang + 'test 3'] ); }); }); @@ -130,7 +131,7 @@ describe('hook error handling', function() { it('should verify results', function() { assert.deepEqual( lines, - ['test 1', 'test 2', 'after', 'test 3'] + ['test 1', 'test 2', 'after', bang + 'test 3'] ); }); }); @@ -140,7 +141,7 @@ describe('hook error handling', function() { it('should verify results', function() { assert.deepEqual( lines, - ['test 1', 'after', 'test 3'] + ['test 1', 'after', bang + 'test 3'] ); }); }); @@ -156,25 +157,25 @@ describe('hook error handling', function() { 'root before each', '1 before each', '1-1 before each', - '1-1 after each', + bang + '1-1 after each', '1 after each', 'root after each', '1-1 after', - '1-2 before', + bang + '1-2 before', 'root before each', '1 before each', '1-2 before each', '1-2 test 1', '1-2 after each', - '1 after each', + bang + '1 after each', 'root after each', '1-2 after', '1 after', '2-1 before', 'root before each', '2 before each', - '2 after each', - 'root after each', + bang + '2 after each', + bang + 'root after each', '2-1 after', '2 after', 'root after' diff --git a/test/integration/retries.js b/test/integration/retries.js index 756cc9dd9b..a24fc482a3 100644 --- a/test/integration/retries.js +++ b/test/integration/retries.js @@ -1,6 +1,7 @@ var assert = require('assert'); var helpers = require('./helpers'); var args = []; +var bang = require('../../lib/reporters/base').symbols.bang; describe('retries', function() { this.timeout(2000); @@ -33,7 +34,7 @@ describe('retries', function() { 'after each 4', 'before each 4', 'TEST 4', - 'after each 5', + bang + 'after each 5', 'after' ];