Merge pull request #210 from alancutter/fix-testing

Get Travis testing again

Author: alancutter

.gitmodules

@@ -1,4 +1,3 @@
 [submodule "test/web-platform-tests"]
-  path = test/web-platform-tests
-  url = https://github.com/alancutter/web-platform-tests.git
-  branch = nativeShippingAPI
+	path = test/web-platform-tests
+	url = https://github.com/web-platform-tests/wpt.git

.travis-setup.sh

@@ -26,6 +26,9 @@ uname -a
 cat /etc/lsb-release
 
 npm install
+# npm may update the package-lock.json. Revert this to avoid failing grunt-checkrepo.
+git checkout HEAD package-lock.json
+
 npm install -g grunt-cli
 
 sudo apt-get update --fix-missing
@@ -62,19 +65,19 @@ Chrome)
   sudo dpkg --install $CHROME || sudo apt-get -f install
   which google-chrome
   ls -l `which google-chrome`
-  
+
   if [ -f /opt/google/chrome/chrome-sandbox ]; then
     export CHROME_SANDBOX=/opt/google/chrome/chrome-sandbox
   else
     export CHROME_SANDBOX=$(ls /opt/google/chrome*/chrome-sandbox)
   fi
-  
+
   # Download a custom chrome-sandbox which works inside OpenVC containers (used on travis).
   sudo rm -f $CHROME_SANDBOX
   sudo wget https://googledrive.com/host/0B5VlNZ_Rvdw6NTJoZDBSVy1ZdkE -O $CHROME_SANDBOX
   sudo chown root:root $CHROME_SANDBOX; sudo chmod 4755 $CHROME_SANDBOX
   sudo md5sum $CHROME_SANDBOX
-  
+
   google-chrome --version
   ;;
 

.travis.yml

@@ -1,11 +1,6 @@
+dist: xenial
+services: xvfb
 language: node_js
-
-node_js:
- - "6.10.2"
-
-install:
-  - BROWSER="Firefox-stable" ./.travis-setup.sh
-
-before_script:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
+node_js: "10.15.3"
+install: BROWSER="Firefox-stable" ./.travis-setup.sh
+script: xvfb-run -a npm test

Gruntfile.js

@@ -191,10 +191,9 @@ module.exports = function(grunt) {
     return new Promise(function(resolve) {
       var karmaConfig = require('karma/lib/config').parseConfig(require('path').resolve('test/karma-config.js'), {});
       configCallback(karmaConfig);
-      var karmaServer = require('karma').server;
-      karmaServer.start(karmaConfig, function(exitCode) {
+      new (require('karma').Server)(karmaConfig, function(exitCode) {
         resolve(exitCode == 0);
-      });
+      }).start();
     });
   }