diff --git a/.travis.yml b/.travis.yml index 318c99f75..66fc7bac8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: @@ -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 diff --git a/gruntfile.js b/gruntfile.js index ed92dca17..73b833d89 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -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'] } } }, @@ -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', diff --git a/karma.conf.js b/karma.conf.js index 64e3195a7..f4e6fd080 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -1,4 +1,3 @@ -/*global module process */ var specsFiles = require('./scripts/findSpecs')("bin/gen/test/", "test") var findRefs = require('./scripts/findRefs') var _ = require('lodash')