Merge pull request #987 from lorenzhs/update-travis

Fix tests and update npm dependencies

.travis.yml

@@ -1,6 +1,7 @@
 language: node_js
 node_js:
-  - "0.10"
+  - "8"
+dist: trusty
 install: "npm install"
 script: "sh -e run_tests.sh"
 notifications:

bower.json

@@ -12,9 +12,11 @@
     "angular-touch": "1.6.x",
     "angular-loader": "1.6.x",
     "angular-mocks": "1.6.x",
-    "html5-boilerplate": "~4.3.0",
+    "underscore": "~1.8"
-    "underscore": "~1.8",
+  },
+  "devDependencies": {
     "bootstrap": "~3.3",
+    "html5-boilerplate": "~4.3.0",
     "emojione": "~2.2"
   },
   "keywords": [

js/localstorage.js

@@ -12,7 +12,7 @@ function StoragePolyfil() {
             return this.keyIndex.length;
         }
     });
-};
+}
 StoragePolyfil.prototype.key = function(idx) {
     return this.keyIndex[idx];
 };

package.json

@@ -7,23 +7,22 @@
   "main": "electron-main.js",
   "license": "GPLv3",
   "devDependencies": {
-    "bower": "^1.3.1",
+    "bower": "^1.8",
     "electron-packager": "^7.0.0",
-    "http-server": "^0.6.1",
+    "http-server": "^0.11",
-    "jasmine-core": "^2.4.1",
+    "jasmine-core": "^3.1",
-    "jshint": "^2.5.2",
+    "jshint": "^2.9",
-    "karma": "~0.13",
+    "karma": "~1.7",
-    "karma-jasmine": "^0.3.6",
+    "karma-jasmine": "~1.1",
-    "karma-junit-reporter": "^0.2.2",
+    "karma-junit-reporter": "^1.2",
     "karma-phantomjs-launcher": "^1.0.0",
-    "phantomjs-prebuilt": "^2.1.1",
+    "protractor": "^5.0.0",
-    "protractor": "~0.20.1",
+    "shelljs": "^0.8.0",
-    "shelljs": "^0.2.6",
+    "uglify-js": "^3"
-    "uglify-js": "^2.4"
   },
   "scripts": {
-    "postinstall": "bower install",
+    "postinstall": "bower install -p",
-    "minify": " uglifyjs js/localstorage.js js/weechat.js js/irc-utils.js js/glowingbear.js js/settings.js js/utils.js js/notifications.js js/filters.js js/handlers.js js/connection.js js/file-change.js js/imgur-drop-directive.js js/whenscrolled-directive.js js/inputbar.js js/plugin-directive.js js/websockets.js js/models.js js/bufferResume.js js/plugins.js js/imgur.js -c -m --screw-ie8 -o min.js --source-map min.map",
+    "minify": " uglifyjs js/localstorage.js js/weechat.js js/irc-utils.js js/glowingbear.js js/settings.js js/utils.js js/notifications.js js/filters.js js/handlers.js js/connection.js js/file-change.js js/imgur-drop-directive.js js/whenscrolled-directive.js js/inputbar.js js/plugin-directive.js js/websockets.js js/models.js js/bufferResume.js js/plugins.js js/imgur.js -c -m --screw-ie8 -o min.js --source-map url='min.js.map'",
     "prestart": "npm install",
     "start": "http-server -a localhost -p 8000",
     "pretest": "npm install",
@@ -33,6 +32,7 @@
     "update-webdriver": "webdriver-manager update",
     "preprotractor": "npm run update-webdriver",
     "protractor": "protractor test/protractor-conf.js",
+    "premake-local": "bower install --dev",
     "make-local": "make -f electron.makefile uselocal",
     "build-electron-windows": "make -f electron.makefile build-electron-windows",
     "build-electron-darwin": "make -f electron.makefile build-electron-darwin",