Merge branch 'gemini' of github.com:almende/vis into gemini

.gemini.js

@@ -10,10 +10,31 @@ module.exports = {
       desiredCapabilities: {
         browserName: "phantomjs"
       }
+    },
+
+    /*
+    chrome: {
+      desiredCapabilities: {
+        browserName: 'chrome',
+        chromeOptions: {
+          args: ["disable-gpu", "no-sandbox"]
+        }
+      }
+    }
+    */
+
+    /*
+    firefox: {
+      desiredCapabilities: {
+        browserName: "firefox"
+        version: "47.0"
+      }
     }
+    */
   },
 
   system: {
+    parallelLimit: 3,
     plugins: {
       'html-reporter': {
         enabled: true,

package.json

@@ -62,11 +62,13 @@
     "gulp-rename": "^1.2.2",
     "gulp-util": "^3.0.8",
     "gulp-webserver": "^0.9.1",
+    "html-reporter": "^0.2.0",
     "jsdom": "9.9.1",
     "jsdom-global": "^2.1.1",
     "mocha": "^3.2.0",
     "mocha-jsdom": "^1.1.0",
     "opn": "^5.1.0",
+    "phantomjs": "^2.1.7",
     "rimraf": "^2.5.4",
     "uglify-js": "^2.7.5",
     "uuid": "^3.0.1",