Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix(adapter): Remove incorrect function and its call. (#183)
The string tested in the function isTopLevelSuite() is not used in jasmine. The
correct string would be Jasmine__TopLevel__Suite (two underscores). So the function
always returns false, and we negate it at the call site, to the child is always
added. That's the correct behavior because we already have a root node matching
the Jasmine top level suite. The test and the function is unnecessary.
  • Loading branch information
johnjbarton committed Mar 29, 2018
1 parent fce80bf commit cada4a9
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 28 deletions.
12 changes: 1 addition & 11 deletions src/adapter.js
Expand Up @@ -163,14 +163,6 @@ function KarmaReporter (tc, jasmineEnv) {
var _Date = Date
var startTimeCurrentSpec = new _Date().getTime()

/**
* @param suite
* @returns {boolean} Return true if it is system jasmine top level suite
*/
function isTopLevelSuite (suite) {
return suite.description === 'Jasmine_TopLevel_Suite'
}

function handleGlobalErrors (result) {
if (result.failedExpectations && result.failedExpectations.length) {
var message = 'An error was thrown in afterAll'
Expand Down Expand Up @@ -215,9 +207,7 @@ function KarmaReporter (tc, jasmineEnv) {
}

this.suiteStarted = function (result) {
if (!isTopLevelSuite(result)) {
currentSuite = currentSuite.addChild(result.description)
}
currentSuite = currentSuite.addChild(result.description)
}

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

it('should remove special top level suite from result', function () {
karma.result.and.callFake(function (result) {
expect(result.suite).toEqual(['Child Suite'])
})

reporter.suiteStarted({
id: 'suite0',
description: 'Jasmine_TopLevel_Suite'
})
reporter.suiteStarted(suite.result)
spec.result.failedExpectations.push({stack: 'stack'})

reporter.specDone(spec.result)

expect(karma.result).toHaveBeenCalled()
})

it('should report time for every spec', function () {
var counter = 3

Expand Down

0 comments on commit cada4a9

Please sign in to comment.