Skip to content

Commit

Permalink
Add Firefox karma tests during CI-build.
Browse files Browse the repository at this point in the history
fixes #110
  • Loading branch information
Shahar Soel committed Dec 25, 2015
1 parent d8f987d commit eb00566
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ matrix:
env: CXX=g++-4.8 GRUNT_TASK=integration_tests
- node_js: "0.10"
env: CXX=g++-4.8 GRUNT_TASK=integration_tests
- node_js: "5"
env: CXX=g++-4.8 GRUNT_TASK=browsers_tests
addons:
apt:
sources:
Expand All @@ -31,6 +33,9 @@ install:
- npm install
- bower install
before_script:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- sleep 3 # give xvfb some time to start
- grunt build
script:
- grunt $GRUNT_TASK
Expand Down
5 changes: 3 additions & 2 deletions gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ module.exports = function(grunt) {

dev_build: {},

tests_on_browsers: {
browsers_tests: {
options: {
files: ['bower_components/lodash/lodash.js', 'test.config.js', 'bin/chevrotain.js', 'bin/chevrotainSpecs.js'],
browsers: ['Chrome', 'Firefox', 'IE']
browsers: ['Firefox']
}
}
},
Expand Down Expand Up @@ -362,6 +362,7 @@ module.exports = function(grunt) {
grunt.registerTask('build_test', buildTestTasks)
grunt.registerTask('unit_tests', unitTestsTasks)
grunt.registerTask('integration_tests', integrationTestsTasks)
grunt.registerTask('browsers_tests', "karma:browsers_tests")

grunt.registerTask('dev_build_test', [
'clean:dev',
Expand Down
1 change: 0 additions & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/*global module process */
var specsFiles = require('./scripts/findSpecs')("bin/gen/test/", "test")
var findRefs = require('./scripts/findRefs')
var _ = require('lodash')
Expand Down

0 comments on commit eb00566

Please sign in to comment.