existing tests: adaptions

mochajs · Jan 23, 2019 · 353ae11 · 353ae11
1 parent 3ca5305
commit 353ae11
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 9 deletions.
diff --git a/test/integration/fixtures/options/bail-with-after.fixture.js b/test/integration/fixtures/options/bail-with-after.fixture.js
@@ -50,7 +50,7 @@ describe('suite2', function () {
   before('before suite2', function () {});
   beforeEach('beforeEach suite2', function () {});
   it('test suite2', function () {
-    runOrder.push('test suite2 - should not run');
+    console.log('test suite2 - should not run');
   });
   afterEach('afterEach suite2', function () {});
   after('after suite2', function () {});

diff --git a/test/integration/fixtures/options/bail-with-before.fixture.js b/test/integration/fixtures/options/bail-with-before.fixture.js
@@ -37,7 +37,7 @@ describe('suite2', function () {
   before('before suite2', function () {});
   beforeEach('beforeEach suite2', function () {});
   it('test suite2', function () {
-    runOrder.push('test suite2 - should not run');
+    console.log('test suite2 - should not run');
   });
   afterEach('afterEach suite2', function () {});
   after('after suite2', function () {});

diff --git a/test/integration/hook-err.spec.js b/test/integration/hook-err.spec.js
@@ -18,7 +18,10 @@ describe('hook error handling', function() {
   describe('before hook error tip', function() {
     before(run('hooks/before-hook-error-tip.fixture.js', onlyErrorTitle()));
     it('should verify results', function() {
-      expect(lines, 'to equal', ['1) spec 2', '"before all" hook:']);
+      expect(lines, 'to equal', [
+        '1) spec 2',
+        '"before all" hook for "skipped":'
+      ]);
     });
   });
 

diff --git a/test/integration/multiple-done.spec.js b/test/integration/multiple-done.spec.js
@@ -90,7 +90,10 @@ describe('multiple calls to done()', function() {
     });
 
     it('correctly attributes the error', function() {
-      assert.strictEqual(res.failures[0].fullTitle, 'suite "before all" hook');
+      assert.strictEqual(
+        res.failures[0].fullTitle,
+        'suite "before all" hook in "suite"'
+      );
       assert.strictEqual(
         res.failures[0].err.message,
         'done() called multiple times'
@@ -116,7 +119,10 @@ describe('multiple calls to done()', function() {
     it('correctly attributes the errors', function() {
       assert.strictEqual(res.failures.length, 2);
       res.failures.forEach(function(failure) {
-        assert.strictEqual(failure.fullTitle, 'suite "before each" hook');
+        assert.strictEqual(
+          failure.fullTitle,
+          'suite "before each" hook in "suite"'
+        );
         assert.strictEqual(failure.err.message, 'done() called multiple times');
       });
     });

diff --git a/test/integration/options.spec.js b/test/integration/options.spec.js
@@ -93,7 +93,10 @@ describe('options', function() {
         }
         expect(res, 'to have failed')
           .and('to have failed test count', 1)
-          .and('to have failed test', '"before all" hook: before suite1')
+          .and(
+            'to have failed test',
+            '"before all" hook: before suite1 for "test suite1"'
+          )
           .and('to have passed test count', 0);
         done();
       });
@@ -147,7 +150,10 @@ describe('options', function() {
         }
         expect(res, 'to have failed')
           .and('to have failed test count', 1)
-          .and('to have failed test', '"after all" hook: after suite1A')
+          .and(
+            'to have failed test',
+            '"after all" hook: after suite1A for "test suite1A"'
+          )
           .and('to have passed test count', 2)
           .and('to have passed test order', 'test suite1', 'test suite1A');
         done();

diff --git a/test/unit/runner.spec.js b/test/unit/runner.spec.js
@@ -344,9 +344,13 @@ describe('Runner', function() {
   describe('.failHook(hook, err)', function() {
     it('should increment .failures', function() {
       expect(runner.failures, 'to be', 0);
-      runner.failHook(new Test('fail hook 1', noop), {});
+      var test1 = new Test('fail hook 1', noop);
+      var test2 = new Test('fail hook 2', noop);
+      suite.addTest(test1);
+      suite.addTest(test2);
+      runner.failHook(test1, {});
       expect(runner.failures, 'to be', 1);
-      runner.failHook(new Test('fail hook 2', noop), {});
+      runner.failHook(test2, {});
       expect(runner.failures, 'to be', 2);
     });
 
@@ -364,6 +368,7 @@ describe('Runner', function() {
 
     it('should emit "fail"', function(done) {
       var hook = new Hook();
+      hook.parent = suite;
       var err = {};
       runner.on('fail', function(hook, err) {
         expect(hook, 'to be', hook);
@@ -375,6 +380,7 @@ describe('Runner', function() {
 
     it('should not emit "end" if suite bail is not true', function(done) {
       var hook = new Hook();
+      hook.parent = suite;
       var err = {};
       suite.bail(false);
       runner.on('end', function() {
@@ -454,6 +460,7 @@ describe('Runner', function() {
 
       it('should prettify the stack-trace', function(done) {
         var hook = new Hook();
+        hook.parent = suite;
         var err = new Error();
         // Fake stack-trace
         err.stack = stack.join('\n');
@@ -475,6 +482,7 @@ describe('Runner', function() {
 
       it('should display the full stack-trace', function(done) {
         var hook = new Hook();
+        hook.parent = suite;
         var err = new Error();
         // Fake stack-trace
         err.stack = stack.join('\n');