Merge branch 'master' into greenkeeper/parse-server-s3-adapter-1.2.0

Author: Arthur Cinader

.travis.yml

@@ -1,8 +1,5 @@
 language: node_js
 dist: trusty
-node_js:
-- '6.10'
-- '7.10'
 services:
   - mongodb
   - postgresql
@@ -27,11 +24,16 @@ stage: test
 env:
   global:
   - COVERAGE_OPTION='./node_modules/.bin/nyc'
+  - NODE_VERSION=6.10 
   matrix:
   - MONGODB_VERSION=3.2.13
   - MONGODB_VERSION=3.4.4
   - PARSE_SERVER_TEST_DB=postgres
   - PARSE_SERVER_TEST_CACHE=redis
+  - NODE_VERSION=8.1.3
+before_install:
+- nvm install $NODE_VERSION
+- nvm use $NODE_VERSION
 before_script:
 - node -e 'require("./lib/index.js")'
 - psql -c 'create database parse_server_postgres_adapter_test_database;' -U postgres

package.json

@@ -55,10 +55,10 @@
     "bcrypt-nodejs": "0.0.3",
     "cross-env": "5.0.2",
     "deep-diff": "0.3.8",
-    "eslint": "^4.0.0",
+    "eslint": "^4.4.1",
     "eslint-plugin-flowtype": "^2.25.0",
     "gaze": "1.1.2",
-    "jasmine": "2.6.0",
+    "jasmine": "2.7.0",
     "jasmine-spec-reporter": "^4.1.0",
     "mongodb-runner": "3.5.0",
     "nodemon": "1.11.0",

src/Adapters/Storage/Postgres/PostgresStorageAdapter.js

@@ -1452,11 +1452,11 @@ function literalizeRegexPart(s) {
   // remove all instances of \Q and \E from the remaining text & escape single quotes
   return (
     s.replace(/([^\\])(\\E)/, '$1')
-    .replace(/([^\\])(\\Q)/, '$1')
-    .replace(/^\\E/, '')
-    .replace(/^\\Q/, '')
-    .replace(/([^'])'/, `$1''`)
-    .replace(/^'([^'])/, `''$1`)
+      .replace(/([^\\])(\\Q)/, '$1')
+      .replace(/^\\E/, '')
+      .replace(/^\\Q/, '')
+      .replace(/([^'])'/, `$1''`)
+      .replace(/^'([^'])/, `''$1`)
   );
 }
 

src/vendor/mongodbUrl.js

@@ -255,8 +255,8 @@ Url.prototype.parse = function(url, parseQueryString, slashesDenoteHost) {
         hostEnd = i;
         break;
       case 64: // '@'
-          // At this point, either we have an explicit point where the
-          // auth portion cannot go past, or the last @ char is the decider.
+        // At this point, either we have an explicit point where the
+        // auth portion cannot go past, or the last @ char is the decider.
         atSign = i;
         nonHost = -1;
         break;