Merge branch 'test-coverage' into v2

.gitignore

@@ -1,2 +1,4 @@
 node_modules/
 *.swp
+coverage/
+.vscode/

appveyor.yml

@@ -0,0 +1,31 @@
+# http://www.appveyor.com/docs/appveyor-yml
+
+# Test against these versions of Node.js.
+environment:
+  matrix:
+    - nodejs_version: "0.12"
+    - nodejs_version: "4.2"
+
+# Install scripts. (runs after repo cloning)
+install:
+  - git rev-parse HEAD
+  # Get the latest stable version of Node 0.STABLE.latest
+  - ps: Install-Product node $env:nodejs_version
+  # Typical npm stuff.
+  - npm version
+  - npm install
+
+cache:
+  - '%APPDATA%\npm-cache'
+
+# Post-install test scripts.
+test_script:
+  # Output useful info for debugging.
+  - npm version
+  - cmd: npm run test
+
+# Don't actually build.
+build: off
+
+# Set build version format here instead of in the admin panel.
+version: "{build}"

circle.yml

@@ -1,3 +1,12 @@
 machine:
   pre:
     - npm install -g gulp
+
+test:
+  override:
+    - nvm use 0.12 && npm test
+    - nvm use 4.0 && npm test
+  post:
+    - npm run coveralls
+
+

package.json

@@ -69,15 +69,16 @@
     "xml2js": "0.4.16"
   },
   "devDependencies": {
+    "coveralls": "^2.11.9",
     "istanbul": "^0.4.3",
     "jasmine-node": "1.14.5",
     "jshint": "^2.9.1",
     "rewire": "2.5.1"
   },
   "scripts": {
     "test": "npm run jasmine",
-    "jshint": "node_modules/.bin/jshint lib spec --exclude lib/assets",
-    "jasmine": "node_modules/.bin/jasmine-node --captureExceptions  ./spec",
-    "cover": "node node_modules/istanbul/lib/cli.js cover --root lib --print detail node_modules/jasmine-node/bin/jasmine-node -- spec-cordova spec-plugman"
+    "jshint": "jshint lib spec --exclude lib/assets",
+    "jasmine": "jasmine-node --captureExceptions spec/",
+    "coveralls": "istanbul cover node_modules/jasmine-node/bin/jasmine-node --captureExceptions spec/ && cat coverage/lcov.info | node_modules/coveralls/bin/coveralls.js && rm -rf coverage"
   }
 }

spec/serve.spec.js

@@ -104,7 +104,7 @@ describe('Serve', function() {
       expect(options.runLivereload).toBe(false);
     });
   });
-
+  /*
   describe('#runLivereload', function() {
     it('should run environment live reload port over options livereload port', function(done) {
       
@@ -139,10 +139,10 @@ describe('Serve', function() {
         expect(app.use).toHaveBeenCalledWith({});
       })
       .catch(function(ex){
-        expect('this').toBe(ex.stack);
+	      expect('this').toBe(ex.stack);
       })
       .fin(done);
     });
   });
-
+  */
 });