Merge 0345d12 into 8bc1942

eiriksm · Dec 23, 2017 · 4d23050 · 4d23050
2 parents 8bc1942 + 0345d12
commit 4d23050
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,8 +8,11 @@ matrix:
   allow_failures:
     - node_js: node
 script:
-  - make test-cov
-  - make test-browser
+  - npm test
+  - npm run test-browser
+after_script:
+  - npm run coverage
+  - cat coverage/karma/*/lcov.info coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js > /dev/null 2>&1
 env:
   - CXX=g++-4.8
 addons:

diff --git a/js/src/booter.js b/js/src/booter.js
@@ -58,11 +58,10 @@ Booter.prototype.attach = function(sel) {
       if (internal) {
         links[i].onclick = this.startFunction;
       }
-
     }
   }
+}
 
-};
 Booter.prototype.navigate = function(url) {
   var win = this.window;
   if (!this.booted && win && win.document) {

diff --git a/package.json b/package.json
@@ -5,7 +5,9 @@
   "main": "index.js",
   "scripts": {
     "watch": "npm i && gulp watch",
-    "test": "mocha"
+    "test": "mocha",
+    "test-browser": "gulp testscript && karma start karma.conf.js --browsers=PhantomJS --single-run=true",
+    "coverage": "istanbul cover _mocha"
   },
   "repository": {
     "type": "git",
@@ -19,6 +21,7 @@
   "homepage": "https://github.com/eiriksm/orkjern_theme",
   "devDependencies": {
     "browserify": "^14.3.0",
+    "coveralls": "^3.0.0",
     "gulp": "^3.8.11",
     "gulp-autoprefixer": "2.2.0",
     "gulp-closure-compiler": "^0.4.0",