Skip to content

Commit

Permalink
Configuration in createStartFn now happens outside the returned start…
Browse files Browse the repository at this point in the history
…Fn (#231)
  • Loading branch information
DirkToewe authored and johnjbarton committed Jan 17, 2019
1 parent 5ee5b8b commit 1f1422a
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/adapter.js
Expand Up @@ -356,18 +356,18 @@ var createSpecFilter = function (config, jasmineEnv) {
* @return {Function} Karma starter function.
*/
function createStartFn (karma, jasmineEnv) {
// This function will be assigned to `window.__karma__.start`:
return function () {
var clientConfig = karma.config || {}
var jasmineConfig = clientConfig.jasmine || {}
var clientConfig = karma.config || {}
var jasmineConfig = clientConfig.jasmine || {}

jasmineEnv = jasmineEnv || window.jasmine.getEnv()
jasmineEnv = jasmineEnv || window.jasmine.getEnv()

jasmineEnv.configure(jasmineConfig)
jasmineEnv.configure(jasmineConfig)

window.jasmine.DEFAULT_TIMEOUT_INTERVAL = jasmineConfig.timeoutInterval ||
window.jasmine.DEFAULT_TIMEOUT_INTERVAL
window.jasmine.DEFAULT_TIMEOUT_INTERVAL = jasmineConfig.timeoutInterval ||
window.jasmine.DEFAULT_TIMEOUT_INTERVAL

// This function will be assigned to `window.__karma__.start`:
return function () {
jasmineEnv.addReporter(new KarmaReporter(karma, jasmineEnv))
jasmineEnv.execute()
}
Expand Down

0 comments on commit 1f1422a

Please sign in to comment.