Merge pull request #587 from ParsePlatform/nlutsenko.cc.test

Do not pass objectId, updatedAt, createdAt to beforeSave hooks on object create.

spec/ParseAPI.spec.js

@@ -390,15 +390,19 @@ describe('miscellaneous', function() {
       var object = req.object;
       expect(object instanceof Parse.Object).toBeTruthy();
       expect(object.get('fooAgain')).toEqual('barAgain');
-      expect(object.id).not.toBeUndefined();
-      expect(object.createdAt).not.toBeUndefined();
-      expect(object.updatedAt).not.toBeUndefined();
       if (triggerTime == 0) {
         // Create
         expect(object.get('foo')).toEqual('bar');
+        // No objectId/createdAt/updatedAt
+        expect(object.id).toBeUndefined();
+        expect(object.createdAt).toBeUndefined();
+        expect(object.updatedAt).toBeUndefined();
       } else if (triggerTime == 1) {
         // Update
         expect(object.get('foo')).toEqual('baz');
+        expect(object.id).not.toBeUndefined();
+        expect(object.createdAt).not.toBeUndefined();
+        expect(object.updatedAt).not.toBeUndefined();
       } else {
         res.error();
       }
@@ -431,10 +435,10 @@ describe('miscellaneous', function() {
     Parse.Cloud.afterSave('GameScore', function(req, res) {
       var object = req.object;
       expect(object instanceof Parse.Object).toBeTruthy();
-      expect(object.get('fooAgain')).toEqual('barAgain');
       expect(object.id).not.toBeUndefined();
       expect(object.createdAt).not.toBeUndefined();
       expect(object.updatedAt).not.toBeUndefined();
+      expect(object.get('fooAgain')).toEqual('barAgain');
       if (triggerTime == 0) {
         // Create
         expect(object.get('foo')).toEqual('bar');
@@ -474,17 +478,21 @@ describe('miscellaneous', function() {
       var object = req.object;
       expect(object instanceof Parse.Object).toBeTruthy();
       expect(object.get('fooAgain')).toEqual('barAgain');
-      expect(object.id).not.toBeUndefined();
-      expect(object.createdAt).not.toBeUndefined();
-      expect(object.updatedAt).not.toBeUndefined();
       var originalObject = req.original;
       if (triggerTime == 0) {
+        // No id/createdAt/updatedAt
+        expect(object.id).toBeUndefined();
+        expect(object.createdAt).toBeUndefined();
+        expect(object.updatedAt).toBeUndefined();
         // Create
         expect(object.get('foo')).toEqual('bar');
         // Check the originalObject is undefined
         expect(originalObject).toBeUndefined();
       } else if (triggerTime == 1) {
         // Update
+        expect(object.id).not.toBeUndefined();
+        expect(object.createdAt).not.toBeUndefined();
+        expect(object.updatedAt).not.toBeUndefined();
         expect(object.get('foo')).toEqual('baz');
         // Check the originalObject
         expect(originalObject instanceof Parse.Object).toBeTruthy();

spec/cloud/main.js

@@ -0,0 +1,104 @@
+var Parse = require('parse/node').Parse;
+
+Parse.Cloud.define('hello', function(req, res) {
+  res.success('Hello world!');
+});
+
+Parse.Cloud.beforeSave('BeforeSaveFail', function(req, res) {
+  res.error('You shall not pass!');
+});
+
+Parse.Cloud.beforeSave('BeforeSaveFailWithPromise', function (req, res) {
+  var query = new Parse.Query('Yolo');
+  query.find().then(() => {
+   res.error('Nope');
+  }, () => {
+    res.success();
+  });
+});
+
+Parse.Cloud.beforeSave('BeforeSaveUnchanged', function(req, res) {
+  res.success();
+});
+
+Parse.Cloud.beforeSave('BeforeSaveChanged', function(req, res) {
+  req.object.set('foo', 'baz');
+  res.success();
+});
+
+Parse.Cloud.afterSave('AfterSaveTest', function(req) {
+  var obj = new Parse.Object('AfterSaveProof');
+  obj.set('proof', req.object.id);
+  obj.save();
+});
+
+Parse.Cloud.beforeDelete('BeforeDeleteFail', function(req, res) {
+  res.error('Nope');
+});
+
+Parse.Cloud.beforeSave('BeforeDeleteFailWithPromise', function (req, res) {
+  var query = new Parse.Query('Yolo');
+  query.find().then(() => {
+    res.error('Nope');
+  }, () => {
+    res.success();
+  });
+});
+
+Parse.Cloud.beforeDelete('BeforeDeleteTest', function(req, res) {
+  res.success();
+});
+
+Parse.Cloud.afterDelete('AfterDeleteTest', function(req) {
+  var obj = new Parse.Object('AfterDeleteProof');
+  obj.set('proof', req.object.id);
+  obj.save();
+});
+
+Parse.Cloud.beforeSave('SaveTriggerUser', function(req, res) {
+  if (req.user && req.user.id) {
+    res.success();
+  } else {
+    res.error('No user present on request object for beforeSave.');
+  }
+});
+
+Parse.Cloud.afterSave('SaveTriggerUser', function(req) {
+  if (!req.user || !req.user.id) {
+    console.log('No user present on request object for afterSave.');
+  }
+});
+
+Parse.Cloud.define('foo', function(req, res) {
+  res.success({
+    object: {
+      __type: 'Object',
+      className: 'Foo',
+      objectId: '123',
+      x: 2,
+      relation: {
+        __type: 'Object',
+        className: 'Bar',
+        objectId: '234',
+        x: 3
+      }
+    },
+    array: [{
+      __type: 'Object',
+      className: 'Bar',
+      objectId: '345',
+      x: 2
+    }],
+    a: 2
+  });
+});
+
+Parse.Cloud.define('bar', function(req, res) {
+  res.error('baz');
+});
+
+Parse.Cloud.define('requiredParameterCheck', function(req, res) {
+  res.success();
+}, function(params) {
+  return params.name;
+});

spec/helper.js

@@ -10,7 +10,7 @@ var ParseServer = require('../src/index').ParseServer;
 var DatabaseAdapter = require('../src/DatabaseAdapter');
 
 var databaseURI = process.env.DATABASE_URI;
-var cloudMain = process.env.CLOUD_CODE_MAIN || './cloud/main.js';
+var cloudMain = process.env.CLOUD_CODE_MAIN || '../spec/cloud/main.js';
 var port = 8378;
 
 // Default server configuration for tests.