Test in firefox on travis

diff --git a/.travis.yml b/.travis.yml
index c66ea5fb77677b4f51ff103956a1bee75164d791..2c250f7179f17c99c2d1ec22b5d048f781729de9 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,10 @@ node_js:
   - "0.11"
   - "0.10"
 
+before_install:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+
 before_script:
   - npm install
 

diff --git a/gulpfile.js b/gulpfile.js
index 39cbc817eb44185f9cdfa324586671f390453182..651217eaf67bc13177e6c7b4dcd5cc5759c8cc0c 100644 (file)
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -139,7 +139,7 @@ function unittestTask() {
 
        return gulp.src(files)
                .pipe(karma({
-                       configFile: 'karma.conf.js',
+                       configFile: 'karma.conf.ci.js',
                        action: 'run'
                }));
 }

diff --git a/karma.conf.ci.js b/karma.conf.ci.js
new file mode 100644 (file)
index 0000000..826b655
--- /dev/null
+++ b/karma.conf.ci.js
@@ -0,0 +1,7 @@
+module.exports = function(config) {
+       config.set({
+               browsers: ['Firefox'],
+               frameworks: ['jasmine'],
+               reporters: ['progress', 'html'],
+       });
+};
\ No newline at end of file