Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use jasmineEnv.configure and update spec #222

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 7 additions & 13 deletions src/adapter.js
Expand Up @@ -332,9 +332,11 @@ var createSpecFilter = function (config, jasmineEnv) {
}
})

jasmineEnv.specFilter = function (spec) {
return specFilter.matches(spec.getFullName())
}
jasmineEnv.configure({
specFilter: function (spec) {
return specFilter.matches(spec.getFullName())
}
})
}

/**
Expand All @@ -355,22 +357,14 @@ function createStartFn (karma, jasmineEnv) {

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

setOption(jasmineConfig.stopOnFailure, jasmineEnv.throwOnExpectationFailure)
setOption(jasmineConfig.failFast, jasmineEnv.stopOnSpecFailure)
setOption(jasmineConfig.seed, jasmineEnv.seed)
setOption(jasmineConfig.random, jasmineEnv.randomizeTests)
jasmineEnv.configure(jasmineConfig)

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

jasmineEnv.addReporter(new KarmaReporter(karma, jasmineEnv))
jasmineEnv.execute()
}

function setOption (option, set) {
if (option != null && typeof set === 'function') {
set(option)
}
jasmineEnv.execute()
}
}

Expand Down
44 changes: 29 additions & 15 deletions test/adapter.spec.js
Expand Up @@ -368,40 +368,48 @@ describe('jasmine adapter', function () {

it('should set random order', function () {
jasmineConfig.random = true
spyOn(jasmineEnv, 'randomizeTests')

createStartFn(tc, jasmineEnv)()

expect(jasmineEnv.randomizeTests).toHaveBeenCalledWith(true)
expect(jasmineEnv.configuration())
.toEqual(jasmine.objectContaining({
random: true
}))
})

it('should set order seed', function () {
var seed = '4321'

jasmineConfig.seed = seed
spyOn(jasmineEnv, 'seed')

createStartFn(tc, jasmineEnv)()

expect(jasmineEnv.seed).toHaveBeenCalledWith(seed)
expect(jasmineEnv.configuration())
.toEqual(jasmine.objectContaining({
seed: seed
}))
})

it('should set stopOnFailure', function () {
jasmineConfig.stopOnFailure = true
spyOn(jasmineEnv, 'throwOnExpectationFailure')
it('should set oneFailurePerSpec', function () {
jasmineConfig.oneFailurePerSpec = true

createStartFn(tc, jasmineEnv)()

expect(jasmineEnv.throwOnExpectationFailure).toHaveBeenCalledWith(true)
expect(jasmineEnv.configuration())
.toEqual(jasmine.objectContaining({
oneFailurePerSpec: true
}))
})

it('should set failFast', function () {
jasmineConfig.failFast = true
spyOn(jasmineEnv, 'stopOnSpecFailure')

createStartFn(tc, jasmineEnv)()

expect(jasmineEnv.stopOnSpecFailure).toHaveBeenCalledWith(true)
expect(jasmineEnv.configuration())
.toEqual(jasmine.objectContaining({
failFast: true
}))
})

it('should change timeoutInterval', function () {
Expand Down Expand Up @@ -602,17 +610,23 @@ describe('jasmine adapter', function () {

describe('createSpecFilter', function () {
it('should create spec filter in jasmine', function () {
var jasmineEnvMock = {}
var karmaConfMock = {
args: ['--grep', 'test']
}
var specMock = {
getFullName: jasmine.createSpy('getFullName').and.returnValue('test')
}
var jasmineEnvMock = {
configure: jasmine.createSpy('configure').and.callFake(function (obj) {
var specFilter = obj.specFilter

expect(specFilter(specMock)).toEqual(true)
})
}
var karmaConfMock = {
args: ['--grep', 'test']
}

createSpecFilter(karmaConfMock, jasmineEnvMock)

expect(jasmineEnvMock.specFilter(specMock)).toEqual(true)
expect(jasmineEnvMock.configure).toHaveBeenCalled()
})
})
})