Merge branch 'travis-npm-token-deploy' into local-grunt-cli

gpac · May 12, 2018 · 3d22169 · 3d22169
2 parents 03f5fd9 + 573f8e9
commit 3d22169
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -3,11 +3,12 @@ sudo: false
 node_js:
 - '6.0.0'
 before_install:
-- echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" > .npmrc
 - "export CHROME_BIN=chromium-browser"
 - "export DISPLAY=:99.0"
 - "sh -e /etc/init.d/xvfb start"
 - sleep 3 # give xvfb some time to start
+before_deploy:
+- echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" > .npmrc
 deploy:
   - provider: releases
     api_key:

diff --git a/karma.conf.js b/karma.conf.js
@@ -12,6 +12,14 @@ module.exports = function(config) {
         frameworks: ['qunit'],
 
 
+        // client configuration
+        client: {
+          qunit: {
+            testTimeout: 5000
+          }
+        },
+
+
         // list of files / patterns to load in the browser
         files: [
           '../src/log.js',                       // logging system