Merge remote-tracking branch 'ParsePlatform/master' into streamVideo_with_gridstoreadapter

# Conflicts:
#	src/Routers/FilesRouter.js

Author: Bragegs

package.json

@@ -18,7 +18,7 @@
   ],
   "license": "BSD-3-Clause",
   "dependencies": {
-    "babel-polyfill": "6.8.0",
+    "babel-polyfill": "6.13.0",
     "babel-runtime": "6.11.6",
     "bcrypt-nodejs": "0.0.3",
     "body-parser": "1.15.2",
@@ -27,39 +27,39 @@
     "deepcopy": "0.6.3",
     "express": "4.14.0",
     "intersect": "1.0.1",
-    "lodash": "4.14.0",
+    "lodash": "4.14.2",
     "lru-cache": "4.0.1",
     "mailgun-js": "0.7.10",
     "mime": "1.3.4",
     "mongodb": "2.2.5",
-    "multer": "1.1.0",
-    "parse": "1.9.0",
+    "multer": "1.2.0",
+    "parse": "1.9.1",
     "parse-server-fs-adapter": "1.0.0",
     "parse-server-push-adapter": "1.0.4",
     "parse-server-s3-adapter": "1.0.4",
     "parse-server-simple-mailgun-adapter": "1.0.0",
-    "pg-promise": "5.2.6",
+    "pg-promise": "5.2.7",
     "redis": "2.6.2",
     "request": "2.74.0",
-    "request-promise": "4.0.1",
-    "semver": "^5.2.0",
+    "request-promise": "4.1.1",
+    "semver": "5.2.0",
     "tv4": "1.2.7",
     "winston": "2.2.0",
     "winston-daily-rotate-file": "1.2.0",
     "ws": "1.1.1"
   },
   "devDependencies": {
     "babel-cli": "6.11.4",
-    "babel-core": "6.11.4",
-    "babel-plugin-syntax-flow": "6.8.0",
+    "babel-core": "6.13.2",
+    "babel-plugin-syntax-flow": "6.13.0",
     "babel-plugin-transform-flow-strip-types": "6.8.0",
-    "babel-preset-es2015": "6.6.0",
+    "babel-preset-es2015": "6.13.2",
     "babel-preset-stage-0": "6.5.0",
-    "babel-register": "6.9.0",
+    "babel-register": "6.11.6",
     "codecov": "1.0.1",
     "cross-env": "2.0.0",
     "deep-diff": "0.3.4",
-    "gaze": "1.1.0",
+    "gaze": "1.1.1",
     "istanbul": "1.0.0-alpha.1",
     "jasmine": "2.4.1",
     "mongodb-runner": "3.3.2",
@@ -68,11 +68,12 @@
   "scripts": {
     "dev": "npm run build && node bin/dev",
     "build": "babel src/ -d lib/",
-    "pretest": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=3.2.6} MONGODB_STORAGE_ENGINE=mmapv1 mongodb-runner start",
-    "test": "cross-env NODE_ENV=test TESTING=1 babel-node $COVERAGE_OPTION ./node_modules/.bin/jasmine",
-    "test:win": "npm run pretest && cross-env NODE_ENV=test TESTING=1 babel-node ./node_modules/.bin/istanbul cover jasmine && npm run posttest",
+    "pretest": "test -z \"$PARSE_SERVER_TEST_DB\" && cross-env MONGODB_VERSION=${MONGODB_VERSION:=3.2.6} MONGODB_STORAGE_ENGINE=mmapv1 mongodb-runner start || echo",
+    "test": "cross-env NODE_ENV=test TESTING=1 babel-node $COVERAGE_OPTION ./node_modules/jasmine/bin/jasmine.js",
+    "test:win": "npm run pretest && cross-env NODE_ENV=test TESTING=1 babel-node ./node_modules/jasmine/bin/jasmine.js && npm run posttest",
     "posttest": "mongodb-runner stop",
     "coverage": "cross-env COVERAGE_OPTION='./node_modules/.bin/istanbul cover' npm test",
+    "coverage:win": "npm run pretest && cross-env NODE_ENV=test TESTING=1 babel-node ./node_modules/babel-istanbul/lib/cli.js cover ./node_modules/jasmine/bin/jasmine.js && npm run posttest",
     "start": "node ./bin/parse-server",
     "prepublish": "npm run build"
   },

spec/Analytics.spec.js

@@ -0,0 +1,61 @@
+const analyticsAdapter = {
+  appOpened: function(parameters, req) {}, 
+  trackEvent: function(eventName, parameters, req) {}
+}
+
+describe('AnalyticsController', () => {
+  it('should track a simple event', (done) => {
+    
+    spyOn(analyticsAdapter, 'trackEvent').and.callThrough();
+    reconfigureServer({
+      analyticsAdapter
+    }).then(() => {
+      return Parse.Analytics.track('MyEvent', {
+        key: 'value',
+        count: '0'
+      })
+    }).then(() => {
+      expect(analyticsAdapter.trackEvent).toHaveBeenCalled();
+      var lastCall = analyticsAdapter.trackEvent.calls.first();
+      let args = lastCall.args;
+      expect(args[0]).toEqual('MyEvent');
+      expect(args[1]).toEqual({
+        dimensions: {
+          key: 'value',
+          count: '0'
+        }
+      });
+      done();
+    }, (err) => {
+      fail(JSON.stringify(err));
+      done();
+    })
+  });
+  
+  it('should track a app opened event', (done) => {
+    
+    spyOn(analyticsAdapter, 'appOpened').and.callThrough();
+    reconfigureServer({
+      analyticsAdapter
+    }).then(() => {
+      return Parse.Analytics.track('AppOpened', {
+        key: 'value',
+        count: '0'
+      })
+    }).then(() => {
+      expect(analyticsAdapter.appOpened).toHaveBeenCalled();
+      var lastCall = analyticsAdapter.appOpened.calls.first();
+      let args = lastCall.args;
+      expect(args[0]).toEqual({
+        dimensions: {
+          key: 'value',
+          count: '0'
+        }
+      });
+      done();
+    }, (err) => {
+      fail(JSON.stringify(err));
+      done();
+    })
+  })
+})

spec/CloudCode.spec.js

@@ -684,6 +684,44 @@ describe('Cloud Code', () => {
     });
   });
 
+it('beforeSave should not affect fetched pointers', done => {
+    Parse.Cloud.beforeSave('BeforeSaveUnchanged', (req, res) => {
+      res.success();
+    });
+
+    Parse.Cloud.beforeSave('BeforeSaveChanged', function(req, res) {
+      req.object.set('foo', 'baz');
+      res.success();
+    });
+
+    var TestObject =  Parse.Object.extend("TestObject");
+    var BeforeSaveUnchangedObject = Parse.Object.extend("BeforeSaveUnchanged");
+    var BeforeSaveChangedObject = Parse.Object.extend("BeforeSaveChanged");
+
+    var aTestObject = new TestObject();
+    aTestObject.set("foo", "bar");
+    aTestObject.save()
+    .then(aTestObject => {
+      var aBeforeSaveUnchangedObject = new BeforeSaveUnchangedObject();
+      aBeforeSaveUnchangedObject.set("aTestObject", aTestObject);
+      expect(aBeforeSaveUnchangedObject.get("aTestObject").get("foo")).toEqual("bar");
+      return aBeforeSaveUnchangedObject.save();
+    })
+    .then(aBeforeSaveUnchangedObject => {
+      expect(aBeforeSaveUnchangedObject.get("aTestObject").get("foo")).toEqual("bar");
+
+      var aBeforeSaveChangedObject = new BeforeSaveChangedObject();
+      aBeforeSaveChangedObject.set("aTestObject", aTestObject);
+      expect(aBeforeSaveChangedObject.get("aTestObject").get("foo")).toEqual("bar");
+      return aBeforeSaveChangedObject.save();
+    })
+    .then(aBeforeSaveChangedObject => {
+      expect(aBeforeSaveChangedObject.get("aTestObject").get("foo")).toEqual("bar");
+      expect(aBeforeSaveChangedObject.get("foo")).toEqual("baz");
+      done();
+    });
+  });
+
   it_exclude_dbs(['postgres'])('should fully delete objects when using `unset` with beforeSave (regression test for #1840)', done => {
     var TestObject = Parse.Object.extend('TestObject');
     var NoBeforeSaveObject = Parse.Object.extend('NoBeforeSave');

spec/CloudCodeLogger.spec.js

@@ -1,10 +1,10 @@
 'use strict';
 var LoggerController = require('../src/Controllers/LoggerController').LoggerController;
-var FileLoggerAdapter = require('../src/Adapters/Logger/FileLoggerAdapter').FileLoggerAdapter;
+var WinstonLoggerAdapter = require('../src/Adapters/Logger/WinstonLoggerAdapter').WinstonLoggerAdapter;
 
 describe("Cloud Code Logger", () => {
     it("should expose log to functions", (done) => {
-        var logController = new LoggerController(new FileLoggerAdapter());
+        var logController = new LoggerController(new WinstonLoggerAdapter());
 
         Parse.Cloud.define("loggerTest", (req, res) => {
             req.log.info('logTest', 'info log', {info: 'some log' });
@@ -35,7 +35,7 @@ describe("Cloud Code Logger", () => {
     });
 
     it("should expose log to trigger", (done) => {
-        var logController = new LoggerController(new FileLoggerAdapter());
+        var logController = new LoggerController(new WinstonLoggerAdapter());
 
         Parse.Cloud.beforeSave("MyObject", (req, res) => {
             req.log.info('beforeSave MyObject', 'info log', {info: 'some log' });

spec/Logger.spec.js

@@ -0,0 +1,18 @@
+var logger = require('../src/logger');
+var winston = require('winston');
+
+class TestTransport extends winston.Transport {
+  log(level, msg, meta, callback) {
+    callback(null, true);
+  }
+}
+
+describe('Logger', () => {
+  it('should add transport', () => {
+    const testTransport = new (TestTransport)({});
+    spyOn(testTransport, 'log');
+    logger.addTransport(testTransport);
+    logger.logger.info('hi');
+    expect(testTransport.log).toHaveBeenCalled();
+  });
+});

spec/LoggerController.spec.js

@@ -1,12 +1,12 @@
 var LoggerController = require('../src/Controllers/LoggerController').LoggerController;
-var FileLoggerAdapter = require('../src/Adapters/Logger/FileLoggerAdapter').FileLoggerAdapter;
+var WinstonLoggerAdapter = require('../src/Adapters/Logger/WinstonLoggerAdapter').WinstonLoggerAdapter;
 
 describe('LoggerController', () => {
   it('can check process a query without throwing', (done) => {
     // Make mock request
     var query = {};
 
-    var loggerController = new LoggerController(new FileLoggerAdapter());
+    var loggerController = new LoggerController(new WinstonLoggerAdapter());
 
     expect(() => {
       loggerController.getLogs(query).then(function(res) {
@@ -69,7 +69,7 @@ describe('LoggerController', () => {
       level: 'error'
     };
 
-    var loggerController = new LoggerController(new FileLoggerAdapter());
+    var loggerController = new LoggerController(new WinstonLoggerAdapter());
 
     expect(() => {
       loggerController.getLogs(query).then(function(res) {

spec/LogsRouter.spec.js

@@ -3,9 +3,9 @@
 const request = require('request');
 var LogsRouter = require('../src/Routers/LogsRouter').LogsRouter;
 var LoggerController = require('../src/Controllers/LoggerController').LoggerController;
-var FileLoggerAdapter = require('../src/Adapters/Logger/FileLoggerAdapter').FileLoggerAdapter;
+var WinstonLoggerAdapter = require('../src/Adapters/Logger/WinstonLoggerAdapter').WinstonLoggerAdapter;
 
-const loggerController = new LoggerController(new FileLoggerAdapter());
+const loggerController = new LoggerController(new WinstonLoggerAdapter());
 
 describe('LogsRouter', () => {
   it('can check valid master key of request', (done) => {

spec/MongoStorageAdapter.spec.js

@@ -6,7 +6,7 @@ const databaseURI = 'mongodb://localhost:27017/parseServerMongoAdapterTestDataba
 
 // These tests are specific to the mongo storage adapter + mongo storage format
 // and will eventually be moved into their own repo
-describe('MongoStorageAdapter', () => {
+describe_only_db('mongo')('MongoStorageAdapter', () => {
   beforeEach(done => {
     new MongoStorageAdapter({ uri: databaseURI })
     .deleteAllClasses()

spec/ParseACL.spec.js

@@ -1093,7 +1093,7 @@ describe('Parse.ACL', () => {
     });
   });
 
-  it("acl saveAll with permissions", (done) => {
+  it_exclude_dbs(['postgres'])("acl saveAll with permissions", (done) => {
     Parse.User.signUp("alice", "wonderland", null, {
       success: function(alice) {
         var acl = new Parse.ACL(alice);

spec/ParseAPI.spec.js

@@ -2,14 +2,13 @@
 // It would probably be better to refactor them into different files.
 'use strict';
 
-var DatabaseAdapter = require('../src/DatabaseAdapter');
 const MongoStorageAdapter = require('../src/Adapters/Storage/Mongo/MongoStorageAdapter');
 var request = require('request');
 const rp = require('request-promise');
 const Parse = require("parse/node");
 let Config = require('../src/Config');
 const SchemaController = require('../src/Controllers/SchemaController');
-var TestUtils = require('../src/index').TestUtils;
+var TestUtils = require('../src/TestUtils');
 const deepcopy = require('deepcopy');
 
 const userSchema = SchemaController.convertSchemaToAdapterSchema({ className: '_User', fields: Object.assign({}, SchemaController.defaultColumns._Default, SchemaController.defaultColumns._User) });
@@ -348,7 +347,7 @@ describe('miscellaneous', function() {
     });
   });
 
-  it('test rest_create_app', function(done) {
+  it_exclude_dbs(['postgres'])('test rest_create_app', function(done) {
     var appId;
     Parse._request('POST', 'rest_create_app').then((res) => {
       expect(typeof res.application_id).toEqual('string');