fix stack location error

.gitignore

@@ -41,3 +41,4 @@ test/dist
 benchmarks
 dist
 src/*.js
+sample.html

benchmarks/ava/test/test1.js

@@ -1,10 +1,10 @@
 
 const test = require('ava');
-for (let i = 0; i < 10; i++) {
+for (let i = 0; i < 8; i++) {
   test('test ' + i, async function (assert) {
     await new Promise(resolve => {
-      setTimeout(()=>resolve(),100);
+      setTimeout(()=>resolve(),50);
     });
-    assert.truthy(Math.random() * 100 > 5);
+    assert.truthy(Math.random() * 100 > 3);
   });
 }

benchmarks/jest/test/test1.js

@@ -1,11 +1,11 @@
 
 describe('add', function () {
-  for (let i = 0; i < 10; i++) {
+  for (let i = 0; i < 8; i++) {
     it('should test',async function () {
       await new Promise(resolve => {
-        setTimeout(()=>resolve(),100);
+        setTimeout(()=>resolve(),50);
       });
-      expect(Math.random() * 100 > 5).toBeTruthy();
+      expect(Math.random() * 100 > 3).toBeTruthy();
     });
   }
 });

benchmarks/mocha/test/test1.js

@@ -1,12 +1,12 @@
 
 const assert = require('assert');
 describe('test file', function() {
-  for(let i=0; i < 10;i++){
+  for(let i=0; i < 8;i++){
     it('test ' + i, function(done) {
       setTimeout(()=>{
-        assert.ok(Math.random() * 100 > 5);
+        assert.ok(Math.random() * 100 > 3);
         done();
-      },100);
+      },50);
     });
   }
 });

benchmarks/tape/test/test1.js

@@ -1,10 +1,10 @@
 
 const test = require('tape');
-for (let i = 0; i < 10; i++) {
+for (let i = 0; i < 8; i++) {
   test('test ' + i, function  (assert) {
     setTimeout(()=>{
-      assert.ok(Math.random() * 100 > 5);
+      assert.ok(Math.random() * 100 > 3);
       assert.end();
-    },100);
+    },50);
   });
 }

benchmarks/zora/index.js

@@ -1,7 +1,8 @@
 
+const {test} = require('../../dist/bundle/index.js');
 const path = require('path');
 const fs = require('fs');
 const tests = fs.readdirSync(path.join(process.cwd(),'./benchmarks/zora/test'));
 for (let f of tests){
-  require(path.join(process.cwd(),'./benchmarks/zora/test/',f));
+  test(f,require(path.join(process.cwd(),'./benchmarks/zora/test/',f)));
 }

benchmarks/zora/test/test1.js

@@ -1,10 +1,10 @@
 
-const {test} = require('../../../dist/bundle/index.js');
-for (let i = 0; i < 10; i++) {
+module.exports =(({test}) => {
+for (let i = 0; i < 8; i++) {
   test('test ' + i, async function (assert) {
     await new Promise(resolve => {
-      setTimeout(()=>resolve(),100);
+      setTimeout(()=>resolve(),50);
     });
-    assert.ok(Math.random() * 100 > 5);
+    assert.ok(Math.random() * 100 > 3);
   });
-}
+}});

scripts/generate.js

@@ -2,19 +2,19 @@ const fs = require('fs');
 const path = require('path');
 
 const filesCount = 12;
-const testCount = 10;
-const waitTime = 100;
+const testCount = 8;
+const waitTime = 50;
 
 const zoraCode = `
-const {test} = require('../../../dist/bundle/index.js');
+module.exports =(({test}) => {
 for (let i = 0; i < ${testCount}; i++) {
   test('test ' + i, async function (assert) {
     await new Promise(resolve => {
       setTimeout(()=>resolve(),${waitTime});
     });
-    assert.ok(Math.random() * 100 > 5);
+    assert.ok(Math.random() * 100 > 3);
   });
-}
+}});
 `;
 
 const avaCode = `
@@ -24,7 +24,7 @@ for (let i = 0; i < ${testCount}; i++) {
     await new Promise(resolve => {
       setTimeout(()=>resolve(),${waitTime});
     });
-    assert.truthy(Math.random() * 100 > 5);
+    assert.truthy(Math.random() * 100 > 3);
   });
 }
 `;
@@ -35,7 +35,7 @@ describe('test file', function() {
   for(let i=0; i < ${testCount};i++){
     it('test ' + i, function(done) {
       setTimeout(()=>{
-        assert.ok(Math.random() * 100 > 5);
+        assert.ok(Math.random() * 100 > 3);
         done();
       },${waitTime});
     });
@@ -48,7 +48,7 @@ const test = require('tape');
 for (let i = 0; i < ${testCount}; i++) {
   test('test ' + i, function  (assert) {
     setTimeout(()=>{
-      assert.ok(Math.random() * 100 > 5);
+      assert.ok(Math.random() * 100 > 3);
       assert.end();
     },${waitTime});
   });
@@ -62,7 +62,7 @@ describe('add', function () {
       await new Promise(resolve => {
         setTimeout(()=>resolve(),${waitTime});
       });
-      expect(Math.random() * 100 > 5).toBeTruthy();
+      expect(Math.random() * 100 > 3).toBeTruthy();
     });
   }
 });
@@ -77,15 +77,15 @@ for (let f of tests){
 }
 `;
 const zoraIndex = `
+const {test} = require('../../dist/bundle/index.js');
 const path = require('path');
 const fs = require('fs');
 const tests = fs.readdirSync(path.join(process.cwd(),'./benchmarks/zora/test'));
 for (let f of tests){
-  require(path.join(process.cwd(),'./benchmarks/zora/test/',f));
+  test(f,require(path.join(process.cwd(),'./benchmarks/zora/test/',f)));
 }
 `;
 
-
 for (let i = 1; i <= filesCount; i++) {
     const zoraPath = path.join(process.cwd(), '/benchmarks/zora/test/', 'test' + i + '.js');
     const avaPath = path.join(process.cwd(), '/benchmarks/ava/test/', 'test' + i + '.js');

src/assertion.ts

@@ -8,16 +8,15 @@ export const isAssertionResult = (result: Test | AssertionResult): result is Ass
 };
 
 const specFnRegexp = /zora_spec_fn/;
-const nodeInternal = /node_modules\/.*|\(internal\/.*/;
 
 const getAssertionLocation = (): string => {
     const err = new Error();
     const stack = (err.stack || '')
         .split('\n')
-        .filter(l => !nodeInternal.test(l) && l !== '');
+        .filter(l => l !== '');
     const userLandIndex = stack.findIndex(l => specFnRegexp.test(l));
-    return (userLandIndex >= 1 ?
-        stack[userLandIndex - 1] : (stack[stack.length - 1] || 'N/A'))
+    const stackline = userLandIndex >= 1 ? stack[userLandIndex - 1] : (stack[stack.length - 1] || 'N/A');
+    return stackline
         .trim()
         .replace(/^at|^@/, '');
 };

test/samples/cases/async.js

@@ -1,4 +1,4 @@
-import {test} from '../../../src/index.js';
+import {test} from '../../../dist/bundle/module.js';
 
 const wait = time => new Promise(resolve => {
     setTimeout(() => resolve(), time);

test/samples/cases/bailout.js

@@ -1,4 +1,4 @@
-import {test} from '../../../src/index.js';
+import {test} from '../../../dist/bundle/module.js';
 
 test('will not go to the end', t => {
     t.ok(true, 'okay');

test/samples/cases/bailout_nested.js

@@ -1,4 +1,4 @@
-import {test} from '../../../src/index.js';
+import {test} from '../../../dist/bundle/module.js';
 
 test('will not go to the end', t => {
     t.ok(true, 'okay');

test/samples/cases/check_flush.js

@@ -1,4 +1,4 @@
-import {test} from '../../../src/index.js';
+import {test} from '../../../dist/bundle/module.js';
 
 const wait = time => new Promise(resolve => {
     setTimeout(() => resolve(), time);

test/samples/cases/custom_assertion.js

@@ -1,4 +1,4 @@
-import {test} from '../../../src/index.js';
+import {test} from '../../../dist/bundle/module.js';
 
 const customAssert = spec => t => {
     return spec(Object.assign(t, {

test/samples/cases/failing.js

@@ -1,4 +1,4 @@
-import {test} from '../../../src/index.js';
+import {test} from '../../../dist/bundle/module.js';
 
 test('tester 1', t => {
     t.ok(true, 'assert1');

test/samples/cases/failing_nested.js

@@ -1,4 +1,4 @@
-import {test} from '../../../src/index.js';
+import {test} from '../../../dist/bundle/module.js';
 
 test('tester 1', t => {
     t.ok(true, 'assert1');

test/samples/cases/mixed_root_test.js

@@ -1,4 +1,4 @@
-import {ok, test, eq} from '../../../src/index.js';
+import {eq, ok, test} from '../../../dist/bundle/module.js';
 
 ok(true, 'true is truthy');
 

test/samples/cases/nested.js

@@ -1,4 +1,4 @@
-import {test} from '../../../src/index.js';
+import {test} from '../../../dist/bundle/module.js';
 
 test('tester 1', t => {
 

test/samples/cases/nested_async.js

@@ -1,4 +1,4 @@
-import {test} from '../../../src/index.js';
+import {test} from '../../../dist/bundle/module.js';
 
 const wait = time => new Promise(resolve => {
     setTimeout(() => resolve(), time);

test/samples/cases/no_only_mode.js

@@ -1,4 +1,4 @@
-import {test, only} from '../../../src/index.js';
+import {test, only} from '../../../dist/bundle/module.js';
 
 test('should not run', t => {
     t.fail('I should not run ');

test/samples/cases/no_only_mode_nested.js

@@ -1,4 +1,4 @@
-import {test, only} from '../../../src/index.js';
+import {test, only} from '../../../dist/bundle/module.js';
 
 test('should not run', t => {
     t.fail('I should not run ');

test/samples/cases/only.js

@@ -1,4 +1,4 @@
-import {test, only} from '../../../src/index.js';
+import {only, test} from '../../../dist/bundle/module.js';
 
 test('should not run', t => {
     t.fail('I should not run ');

test/samples/cases/only_nested.js

@@ -1,4 +1,4 @@
-import {test, only} from '../../../src/index.js';
+import {test, only} from '../../../dist/bundle/module.js';
 
 test('should not run', t => {
     t.fail('I should not run ');

test/samples/cases/root_level_failing.js

@@ -1,5 +1,5 @@
-import {ok ,eq} from '../../../src/index.js';
+import {eq, ok} from '../../../dist/bundle/module.js';
 
 ok(true, 'true is truthy');
-eq([],[2],'unhappy arrays');
+eq([], [2], 'unhappy arrays');
 eq({foo: 'bar'}, {foo: 'bar'}, 'foo bar');

test/samples/cases/root_level_only.js

@@ -1,4 +1,4 @@
-import {ok, eq} from '../../../src/index.js';
+import {eq, ok} from '../../../dist/bundle/module.js';
 
 ok(true, 'true is truthy');
 eq({foo: 'bar'}, {foo: 'bar'}, 'foo bar');

test/samples/cases/simple.js

@@ -1,4 +1,4 @@
-import {test} from '../../../src/index.js';
+import {test} from '../../../dist/bundle/module.js';
 
 test('tester 1', t => {
     t.ok(true, 'assert1');

test/samples/cases/skip.js

@@ -1,4 +1,4 @@
-import {test, ok, skip} from '../../../src/index.js';
+import {test, ok, skip} from '../../../dist/bundle/module.js';
 
 ok(true, 'hey hey');
 ok(true, 'hey hey bis');

test/samples/cases/symbol.js

@@ -1,6 +1,6 @@
-import {test} from '../../../src/index.js';
+import {test} from '../../../dist/bundle/module.js';
 
 test('symbol tester 1', t => {
-    t.equal(Symbol('foo'),Symbol('bar'),'Symbol foo should equal Symbol bar');
-    t.equal({symbol: Symbol('foo')},{symbol:Symbol('bar')}, 'Property Symbol foo should equal Symbol bar')
+    t.equal(Symbol('foo'), Symbol('bar'), 'Symbol foo should equal Symbol bar');
+    t.equal({symbol: Symbol('foo')}, {symbol: Symbol('bar')}, 'Property Symbol foo should equal Symbol bar');
 });