Skip to content

Commit

Permalink
Merge pull request #162 from TheModMaker/feat-afterAllErrors
Browse files Browse the repository at this point in the history
feat: Propagate errors thrown in afterAll blocks
  • Loading branch information
maksimr committed Mar 29, 2017
2 parents fe23ac7 + f3fa264 commit 372adb9
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 0 deletions.
20 changes: 20 additions & 0 deletions src/adapter.js
Expand Up @@ -170,6 +170,18 @@ function KarmaReporter (tc, jasmineEnv) {
return suite.description === 'Jasmine_TopLevel_Suite'
}

function handleGlobalErrors (result) {
if (result.failedExpectations && result.failedExpectations.length) {
var message = 'An error was thrown in afterAll'
var steps = result.failedExpectations
for (var i = 0, l = steps.length; i < l; i++) {
message += '\n' + formatFailedStep(steps[i])
}

tc.error(message)
}
}

/**
* Jasmine 2.0 dispatches the following events:
*
Expand All @@ -191,6 +203,10 @@ function KarmaReporter (tc, jasmineEnv) {

this.jasmineDone = function (result) {
result = result || {}

// Any errors in top-level afterAll blocks are given here.
handleGlobalErrors(result)

tc.complete({
order: result.order,
coverage: window.__coverage__
Expand All @@ -210,6 +226,10 @@ function KarmaReporter (tc, jasmineEnv) {
return
}

// Any errors in afterAll blocks are given here, except for top-level
// afterAll blocks.
handleGlobalErrors(result)

currentSuite = currentSuite.parent
}

Expand Down
17 changes: 17 additions & 0 deletions test/adapter.spec.js
Expand Up @@ -145,6 +145,23 @@ describe('jasmine adapter', function () {
expect(karma.result).toHaveBeenCalled()
})

it('should report errors in afterAll blocks', function () {
spyOn(karma, 'complete')
spyOn(karma, 'error')

var result = {
failedExpectations: []
}

reporter.jasmineDone(result)
expect(karma.error).not.toHaveBeenCalled()

result.failedExpectations.push({})

reporter.jasmineDone(result)
expect(karma.error).toHaveBeenCalled()
})

it('should report executedExpectCount as sum of passed and failed expectations', function () {
karma.result.and.callFake(function (result) {
expect(result.executedExpectationsCount).toBe(2)
Expand Down

0 comments on commit 372adb9

Please sign in to comment.