Skip to content

Commit a2df99b

Browse files
shreyas-pandurangashreyas-panduranga
committed
Fixing some linter errors
1 parent 7713242 commit a2df99b

File tree

4 files changed

+35
-20
lines changed

4 files changed

+35
-20
lines changed

‎lib/runner/extensions/event.command.js‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,10 @@ module.exports = {
538538
_eventItemName: currentEventItem && currentEventItem.name
539539
}
540540
}, function (err, result) {
541+
var assertionError,
542+
shouldStop = false,
543+
isAssertionFailure;
544+
541545
this.host.removeAllListeners(EXECUTION_REQUEST_EVENT_BASE + executionId);
542546
this.host.removeAllListeners(EXECUTION_ASSERTION_EVENT_BASE + executionId);
543547
this.host.removeAllListeners(EXECUTION_RESPONSE_EVENT_BASE + executionId);
@@ -586,7 +590,7 @@ module.exports = {
586590
// For stopOnAssertionFailure, we only create an error if there are assertion failures
587591
// For stopOnFailure/abortOnFailure, we create error for any failures
588592
if (!err && (abortOnFailure || stopOnFailure || stopOnAssertionFailure)) {
589-
var assertionError = postProcessContext(result, assertionFailed);
593+
assertionError = postProcessContext(result, assertionFailed);
590594

591595
// For stopOnAssertionFailure, only set err if it's an assertion failure
592596
// For stopOnFailure/abortOnFailure, set err for any error
@@ -653,15 +657,14 @@ module.exports = {
653657

654658
// move to next script and pass on the results for accumulation
655659
// For stopOnAssertionFailure, only stop if the error is an assertion failure
656-
var shouldStop = false;
657-
658660
if (err) {
659-
var isAssertionFailure = err.name === ASSERTION_FAILURE ||
661+
isAssertionFailure = err.name === ASSERTION_FAILURE ||
660662
(err.error && err.error.name === ASSERTION_FAILURE);
661663

662664
if (stopOnScriptError || abortOnError || stopOnFailure) {
663665
shouldStop = true;
664-
} else if (stopOnAssertionFailure && isAssertionFailure) {
666+
}
667+
else if (stopOnAssertionFailure && isAssertionFailure) {
665668
shouldStop = true;
666669
}
667670
}

‎lib/runner/extensions/item.command.js‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,9 @@ module.exports = {
246246
stopOnAssertionFailure: stopOnAssertionFailure
247247
}).done(function (testExecutions, testExecutionError) {
248248
var visualizerData = extractVisualizerData(prereqExecutions, testExecutions),
249-
visualizerResult;
249+
visualizerResult,
250+
shouldStop = false,
251+
isAssertionFailure;
250252

251253
if (visualizerData) {
252254
visualizer.processTemplate(visualizerData.template,
@@ -278,14 +280,14 @@ module.exports = {
278280

279281
// Check if we should stop: stopOnError/stopOnFailure stop on any error,
280282
// stopOnAssertionFailure only stops on assertion failures
281-
var shouldStop = false;
282283
if (testExecutionError) {
283-
var isAssertionFailure = testExecutionError.name === 'AssertionFailure' ||
284+
isAssertionFailure = testExecutionError.name === 'AssertionFailure' ||
284285
(testExecutionError.error && testExecutionError.error.name === 'AssertionFailure');
285286

286287
if (stopOnError || stopOnFailure) {
287288
shouldStop = true;
288-
} else if (stopOnAssertionFailure && isAssertionFailure) {
289+
}
290+
else if (stopOnAssertionFailure && isAssertionFailure) {
289291
shouldStop = true;
290292
}
291293
}

‎lib/runner/util.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,8 @@ module.exports = {
344344
seekingToStart,
345345
stopRunNow,
346346
stopOnFailure = runnerOptions.stopOnFailure,
347-
stopOnAssertionFailure = runnerOptions.stopOnAssertionFailure;
347+
stopOnAssertionFailure = runnerOptions.stopOnAssertionFailure,
348+
isAssertionFailure;
348349

349350
if (!executionError) {
350351
// extract set next request
@@ -383,12 +384,13 @@ module.exports = {
383384
// If we need to stop on a run, we set the stop flag to true.
384385
// stopOnFailure stops on any error, stopOnAssertionFailure only stops on assertion failures
385386
if (executionError) {
386-
var isAssertionFailure = executionError.name === 'AssertionFailure' ||
387+
isAssertionFailure = executionError.name === 'AssertionFailure' ||
387388
(executionError.error && executionError.error.name === 'AssertionFailure');
388389

389390
if (stopOnFailure) {
390391
stopRunNow = true;
391-
} else if (stopOnAssertionFailure && isAssertionFailure) {
392+
}
393+
else if (stopOnAssertionFailure && isAssertionFailure) {
392394
stopRunNow = true;
393395
}
394396
}

‎test/unit/runner-util.test.js‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -270,25 +270,31 @@ describe('runner util', function () {
270270
});
271271

272272
it('should set stopRunNow on AssertionFailure error with stopOnAssertionFailure', function () {
273-
var assertionError = new Error('Assertion failed');
273+
var assertionError = new Error('Assertion failed'),
274+
result;
275+
274276
assertionError.name = 'AssertionFailure';
275277
mockOptions.executionError = assertionError;
276278
mockOptions.runnerOptions.stopOnAssertionFailure = true;
277279

278-
var result = runnerUtil.processExecutionResult(mockOptions);
280+
result = runnerUtil.processExecutionResult(mockOptions);
279281

280282
expect(result.stopRunNow).to.be.true;
281283
});
282284

283-
it('should set stopRunNow on AssertionFailure error nested in error property with stopOnAssertionFailure', function () {
284-
var assertionError = new Error('Assertion failed');
285+
it('should set stopRunNow on AssertionFailure error nested in error property ' +
286+
'with stopOnAssertionFailure', function () {
287+
var assertionError = new Error('Assertion failed'),
288+
wrapperError = new Error('Wrapper error'),
289+
result;
290+
285291
assertionError.name = 'AssertionFailure';
286-
var wrapperError = new Error('Wrapper error');
292+
287293
wrapperError.error = assertionError;
288294
mockOptions.executionError = wrapperError;
289295
mockOptions.runnerOptions.stopOnAssertionFailure = true;
290296

291-
var result = runnerUtil.processExecutionResult(mockOptions);
297+
result = runnerUtil.processExecutionResult(mockOptions);
292298

293299
expect(result.stopRunNow).to.be.true;
294300
});
@@ -303,12 +309,14 @@ describe('runner util', function () {
303309
});
304310

305311
it('should NOT set stopRunNow on AssertionFailure error when stopOnAssertionFailure is false', function () {
306-
var assertionError = new Error('Assertion failed');
312+
var assertionError = new Error('Assertion failed'),
313+
result;
314+
307315
assertionError.name = 'AssertionFailure';
308316
mockOptions.executionError = assertionError;
309317
mockOptions.runnerOptions.stopOnAssertionFailure = false;
310318

311-
var result = runnerUtil.processExecutionResult(mockOptions);
319+
result = runnerUtil.processExecutionResult(mockOptions);
312320

313321
expect(result.stopRunNow).to.be.undefined;
314322
});

0 commit comments

Comments
 (0)