Merge pull request #604 from audreyso/CB-13501

CB-13501 : added support for node 8 and cleaned up eslint

Author: audreyso

.travis.yml

@@ -5,16 +5,8 @@ git:
 node_js:
   - "4"
   - "6"
+  - "8"
 install:
-  - git clone https://github.com/apache/cordova-js --depth 10
-  - git clone https://github.com/apache/cordova-fetch --depth 10
-  - git clone https://github.com/apache/cordova-serve --depth 10
-  - git clone https://github.com/apache/cordova-common --depth 10
-  - (cd cordova-js && npm install && npm link .)
-  - (cd cordova-common && npm install && npm link .)
-  - (cd cordova-serve && npm install && npm link .)
-  - (cd cordova-fetch && npm link cordova-common && npm install && npm link .)
-  - (npm link cordova-serve && npm link cordova-fetch && npm link cordova-common && npm link cordova-js)
   - npm install
   # Workaround for npm/npm#10343 when dependency of linked module is moved to dependent
   # module's 'node_modules' In our case 'cordova-common' -> jshint' -> 'cli' dependency

appveyor.yml

@@ -5,31 +5,10 @@ environment:
   matrix:
   - nodejs_version: "4"
   - nodejs_version: "6"
+  - nodejs_version: "8"
 
 install:
   - ps: Install-Product node $env:nodejs_version
-  - git clone https://github.com/apache/cordova-js --depth 10
-  - git clone https://github.com/apache/cordova-common --depth 10
-  - git clone https://github.com/apache/cordova-fetch --depth 10
-  - git clone https://github.com/apache/cordova-serve --depth 10
-  - cd cordova-js
-  - npm install
-  - npm link .
-  - cd ../cordova-common
-  - npm install
-  - npm link .
-  - cd ../cordova-serve
-  - npm install
-  - npm link .
-  - cd ../cordova-fetch
-  - npm link cordova-common
-  - npm install
-  - npm link .
-  - cd ../
-  - npm link cordova-js
-  - npm link cordova-fetch
-  - npm link cordova-common
-  - npm link cordova-serve
   - npm install
   # Workaround for npm/npm#10343 when dependency of linked module is moved to dependent
   # module's 'node_modules' In our case 'cordova-common' -> jshint' -> 'cli' dependency

package.json

@@ -20,7 +20,7 @@
     "aliasify": "^2.1.0",
     "cordova-common": "2.1.1",
     "cordova-create": "~1.1.0",
-    "cordova-fetch": "1.2.0",
+    "cordova-fetch": "1.2.1",
     "cordova-js": "4.2.2",
     "cordova-serve": "^2.0.0",
     "dep-graph": "1.1.0",

spec/cordova/util.spec.js

@@ -312,8 +312,9 @@ describe('util module', function () {
 
         describe('getPlatformApiFunction', function () {
             it('Test 027 : should throw error informing user to update platform', function () {
-                expect(function () { util.getPlatformApiFunction('some/path', 'android'); }).toThrow(new Error // eslint-disable-line func-call-spacing
-                ('Uncaught, unspecified "error" event. ( Using this version of Cordova with older version of cordova-android is deprecated. Upgrade to [email protected] or newer.)'));
+                expect(function () { util.getPlatformApiFunction('some/path', 'android'); }).toThrowError(
+                    /(Uncaught, unspecified|Unhandled) "error" event. \( Using this version of Cordova with older version of cordova-android is deprecated\. Upgrade to cordova-android@5\.0\.0 or newer.\)/
+                );
             });
 
             it('Test 028 : should throw error if platform is not supported', function () {

src/cordova/plugin/add.js

@@ -240,9 +240,8 @@ function determinePluginTarget (projectRoot, cfg, target, fetchOptions) {
     // If parsedSpec.version satisfies pkgJson version, no writing to pkg.json. Only write when
     // it does not satisfy.
     /* if (parsedSpec.version) {
-        
         if (pkgJson && pkgJson.dependencies && pkgJson.dependencies[parsedSpec.package]) {
-            //it can only go in here if 
+            //it can only go in here if
             var noSymbolVersion = parsedSpec.version;
             if (parsedSpec.version.charAt(0) === '^' || parsedSpec.version.charAt(0) === '~') {
                 noSymbolVersion = parsedSpec.version.slice(1);