Skip to content

Commit efc3b31

Browse files
committed
Code style tweaks
1 parent cb1c3f7 commit efc3b31

40 files changed

+149
-39
lines changed

api.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ class Api extends EventEmitter {
5555
this.options = Object.assign({match: []}, options);
5656
this.options.require = resolveModules(this.options.require);
5757
}
58+
5859
_runFile(file, runStatus, execArgv) {
5960
const hash = this.precompiler.precompileFile(file);
6061
const precompiled = Object.assign({}, this._precompiledHelpers);
@@ -71,17 +72,20 @@ class Api extends EventEmitter {
7172

7273
return emitter;
7374
}
75+
7476
run(files, options) {
7577
return new AvaFiles({cwd: this.options.resolveTestsFrom, files})
7678
.findTestFiles()
7779
.then(files => this._run(files, options));
7880
}
81+
7982
_onTimeout(runStatus) {
8083
const timeout = ms(this.options.timeout);
8184
const err = new AvaError(`Exited because no new tests completed within the last ${timeout}ms of inactivity`);
8285
this._handleError(runStatus, err);
8386
runStatus.emit('timeout');
8487
}
88+
8589
_setupTimeout(runStatus) {
8690
const timeout = ms(this.options.timeout);
8791

@@ -92,9 +96,11 @@ class Api extends EventEmitter {
9296
runStatus._restartTimer();
9397
runStatus.on('test', runStatus._restartTimer);
9498
}
99+
95100
_cancelTimeout(runStatus) {
96101
runStatus._restartTimer.cancel();
97102
}
103+
98104
_setupPrecompiler(files) {
99105
const isCacheEnabled = this.options.cacheEnabled !== false;
100106
let cacheDir = uniqueTempDir();
@@ -121,6 +127,7 @@ class Api extends EventEmitter {
121127
});
122128
});
123129
}
130+
124131
_precompileHelpers() {
125132
this._precompiledHelpers = {};
126133

@@ -136,6 +143,7 @@ class Api extends EventEmitter {
136143
this._precompiledHelpers[file] = hash;
137144
});
138145
}
146+
139147
_run(files, options) {
140148
options = options || {};
141149

@@ -175,6 +183,7 @@ class Api extends EventEmitter {
175183
return this._runWithPool(files, runStatus, concurrency);
176184
});
177185
}
186+
178187
_computeForkExecArgs(files) {
179188
const execArgv = this.options.testOnlyExecArgv || process.execArgv;
180189
let debugArgIndex = -1;
@@ -220,12 +229,14 @@ class Api extends EventEmitter {
220229
return forkExecArgv;
221230
});
222231
}
232+
223233
_handleError(runStatus, err) {
224234
runStatus.handleExceptions({
225235
exception: err,
226236
file: err.file ? path.relative(process.cwd(), err.file) : undefined
227237
});
228238
}
239+
229240
_runWithPool(files, runStatus, concurrency) {
230241
const tests = [];
231242
let execArgvList;

bench/concurrent/alternating-sync-async.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import test from '../../';
1+
import test from '../..';
22

33
for (let i = 0; i < 10000; i++) {
44
if (i % 2) {

bench/concurrent/async-immediate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import test from '../../';
1+
import test from '../..';
22

33
for (let i = 0; i < 10000; i++) {
44
test(`test${i}`, () => new Promise(resolve => setImmediate(resolve)));

bench/concurrent/async-timeout.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import test from '../../';
1+
import test from '../..';
22

33
for (let i = 0; i < 10000; i++) {
44
test(`test${i}`, () => new Promise(resolve => setTimeout(resolve, 0)));

bench/concurrent/sync.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import test from '../../';
1+
import test from '../..';
22

33
for (let i = 0; i < 10000; i++) {
44
test(`test${i}`, () => {});

bench/other/failures.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import test from '../../';
1+
import test from '../..';
22

33
for (let i = 0; i < 1000; i++) {
44
test.serial(`test${i}`, t => {

bench/serial/alternating-sync-async.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import test from '../../';
1+
import test from '../..';
22

33
for (let i = 0; i < 10000; i++) {
44
if (i % 2) {

bench/serial/async-immediate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import test from '../../';
1+
import test from '../..';
22

33
for (let i = 0; i < 10000; i++) {
44
test.serial(`test${i}`, () => new Promise(resolve => setImmediate(resolve)));

bench/serial/async-timeout.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import test from '../../';
1+
import test from '../..';
22

33
for (let i = 0; i < 3000; i++) {
44
test.serial(`test${i}`, () => new Promise(resolve => setTimeout(resolve, 0)));

bench/serial/sync.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import test from '../../';
1+
import test from '../..';
22

33
for (let i = 0; i < 10000; i++) {
44
test.serial(`test${i}`, () => {});

0 commit comments

Comments
 (0)