bumped karma, updated test config to run with new version of karma

fix-space-nbsp
Dmitri Akatov 11 years ago
parent dab97313db
commit 232a698a83

@ -24,12 +24,15 @@
"should": "~1.2.2", "should": "~1.2.2",
"grunt-coffee-redux": "~0.2.3", "grunt-coffee-redux": "~0.2.3",
"grunt-contrib-coffee": "~0.7.0", "grunt-contrib-coffee": "~0.7.0",
"grunt-contrib-clean": "~0.4.1", "grunt-contrib-clean": "~0.5.0",
"grunt-contrib-watch": "~0.4.4", "grunt-contrib-watch": "~0.4.4",
"grunt-contrib-jshint": "~0.6.0", "grunt-contrib-jshint": "~0.6.0",
"grunt-coffeelint": "0.0.6", "grunt-coffeelint": "0.0.7",
"coffee-script": "~1.6.3", "coffee-script": "~1.6.3",
"karma": "~0.8.5", "karma": "~0.9.4",
"grunt-karma": "~0.4.4" "grunt-karma": "~0.5.0",
"karma-ng-scenario": "0.0.2",
"karma-coffee-preprocessor": "0.0.2",
"karma-mocha": "0.0.3"
} }
} }

@ -1,52 +1,52 @@
basePath = '..' module.exports = (config) ->
toServe = for file in [
toServe = [ 'components/bootstrap-css/css/bootstrap.css'
'components/bootstrap-css/css/bootstrap.css' 'components/jquery/jquery.js'
'components/jquery/jquery.js' 'components/angular-unstable/angular.js'
'components/angular-unstable/angular.js' 'components/angular-bootstrap/ui-bootstrap.js'
'components/angular-bootstrap/ui-bootstrap.js' 'components/angular-bootstrap/ui-bootstrap-tpls.js'
'components/angular-bootstrap/ui-bootstrap-tpls.js' 'angular-contenteditable.js'
'angular-contenteditable.js' 'test/fixtures/simple.html'
'test/fixtures/simple.html' 'test/fixtures/typeahead1.html'
'test/fixtures/typeahead1.html' 'test/fixtures/typeahead2.html'
'test/fixtures/typeahead2.html' 'test/fixtures/typeahead3.html'
'test/fixtures/typeahead3.html' 'test/fixtures/states.json'
'test/fixtures/states.json' 'test/fixtures/img/ru.gif'
'test/fixtures/img/ru.gif' 'test/fixtures/img/gb.gif'
'test/fixtures/img/gb.gif' 'test/fixtures/img/us.gif'
'test/fixtures/img/us.gif' ]
]
toServe =
for file in toServe
pattern: file pattern: file
watched: false watched: false
included: false included: false
served: true served: true
files = [ config.set
ANGULAR_SCENARIO basePath: '..'
ANGULAR_SCENARIO_ADAPTER
'src/**/*.coffee'
'test/e2e/**/*.coffee'
].concat toServe
exclude = [] frameworks: ['ng-scenario']
reporters = ['progress'] preprocessors: '**/*.coffee': 'coffee'
port = 9876 files: [
'test/e2e/**/*.coffee'
].concat toServe
runnerPort = 9100 exclude: []
colors = true reporters: ['progress']
logLevel = LOG_INFO port: 9876
autoWatch = true runnerPort: 9100
browsers = ['Chrome'] colors: true
captureTimeout = 60000 logLevel: config.LOG_INFO
singleRun = false autoWatch: true
browsers: ['Chrome']
captureTimeout: 60000
singleRun: false

@ -1,30 +1,33 @@
basePath = '..' module.exports = (config) ->
config.set
basePath: '..'
frameworks: ['mocha']
files: [
'components/expect/expect.js'
'components/angular/angular.js'
'src/**/*.coffee'
'test/unit/*.coffee'
]
files =
[ MOCHA
, MOCHA_ADAPTER
, 'components/expect/expect.js'
, 'components/angular/angular.js'
, 'src/**/*.coffee'
, 'test/unit/*.coffee'
]
exclude = [] preprocessors: '**/*.coffee': 'coffee'
reporters = ['progress'] exclude: []
port = 9876 reporters: ['progress']
runnerPort = 9100 port: 9876
colors = true runnerPort: 9100
logLevel = LOG_INFO colors: true
autoWatch = true logLevel: LOG_INFO
browsers = ['Chrome'] autoWatch: true
captureTimeout = 60000 browsers: ['Chrome']
singleRun = false captureTimeout: 60000
singleRun: false

@ -47,8 +47,8 @@ angular.scenario.dsl 'scope', ->
else else
done "don't understand argument #{arg}" done "don't understand argument #{arg}"
describe 'radians', -> describe 'module contenteditable', ->
describe 'contenteditable', -> describe 'directive contenteditable', ->
describe 'simple application', -> describe 'simple application', ->
beforeEach -> beforeEach ->
browser().navigateTo 'base/test/fixtures/simple.html' browser().navigateTo 'base/test/fixtures/simple.html'