Merge branch 'upstream' into batchTransaction

Author: davimacedo

spec/RedisCacheAdapter.spec.js

@@ -188,7 +188,7 @@ describe_only(() => {
     const object = new TestObject();
     object.set('foo', 'bar');
     await object.save();
-    expect(getSpy.calls.count()).toBe(2);
+    expect(getSpy.calls.count()).toBe(3);
     expect(putSpy.calls.count()).toBe(2);
   });
 
@@ -201,7 +201,7 @@ describe_only(() => {
       booleanField: true,
     });
     await container.save();
-    expect(getSpy.calls.count()).toBe(2);
+    expect(getSpy.calls.count()).toBe(3);
     expect(putSpy.calls.count()).toBe(2);
   });
 
@@ -215,7 +215,7 @@ describe_only(() => {
 
     object.set('foo', 'barz');
     await object.save();
-    expect(getSpy.calls.count()).toBe(2);
+    expect(getSpy.calls.count()).toBe(3);
     expect(putSpy.calls.count()).toBe(0);
   });
 
@@ -233,7 +233,7 @@ describe_only(() => {
       objects.push(object);
     }
     await Parse.Object.saveAll(objects);
-    expect(getSpy.calls.count()).toBe(11);
+    expect(getSpy.calls.count()).toBe(21);
     expect(putSpy.calls.count()).toBe(10);
 
     getSpy.calls.reset();
@@ -258,7 +258,7 @@ describe_only(() => {
       objects.push(object);
     }
     await Parse.Object.saveAll(objects, { batchSize: 5 });
-    expect(getSpy.calls.count()).toBe(12);
+    expect(getSpy.calls.count()).toBe(22);
     expect(putSpy.calls.count()).toBe(5);
 
     getSpy.calls.reset();
@@ -279,7 +279,7 @@ describe_only(() => {
 
     object.set('new', 'barz');
     await object.save();
-    expect(getSpy.calls.count()).toBe(2);
+    expect(getSpy.calls.count()).toBe(3);
     expect(putSpy.calls.count()).toBe(1);
   });
 
@@ -299,7 +299,7 @@ describe_only(() => {
       booleanField: true,
     });
     await object.save();
-    expect(getSpy.calls.count()).toBe(2);
+    expect(getSpy.calls.count()).toBe(3);
     expect(putSpy.calls.count()).toBe(1);
   });
 
@@ -309,7 +309,7 @@ describe_only(() => {
     user.setPassword('testing');
     await user.signUp();
 
-    expect(getSpy.calls.count()).toBe(6);
+    expect(getSpy.calls.count()).toBe(8);
     expect(putSpy.calls.count()).toBe(1);
   });
 
@@ -326,7 +326,7 @@ describe_only(() => {
 
     object.set('foo', 'bar');
     await object.save();
-    expect(getSpy.calls.count()).toBe(3);
+    expect(getSpy.calls.count()).toBe(4);
     expect(putSpy.calls.count()).toBe(1);
 
     getSpy.calls.reset();

spec/Schema.spec.js

@@ -504,7 +504,7 @@ describe('SchemaController', () => {
       schema
         .addClassIfNotExists('_InvalidName', { foo: { type: 'String' } })
         .catch(error => {
-          expect(error.error).toEqual(
+          expect(error.message).toEqual(
             'Invalid classname: _InvalidName, classnames can only have alphanumeric characters and _, and must start with an alpha character '
           );
           done();
@@ -522,7 +522,7 @@ describe('SchemaController', () => {
       )
       .catch(error => {
         expect(error.code).toEqual(Parse.Error.INVALID_KEY_NAME);
-        expect(error.error).toEqual('invalid field name: 0InvalidName');
+        expect(error.message).toEqual('invalid field name: 0InvalidName');
         done();
       });
   });
@@ -535,7 +535,7 @@ describe('SchemaController', () => {
       )
       .catch(error => {
         expect(error.code).toEqual(136);
-        expect(error.error).toEqual('field objectId cannot be added');
+        expect(error.message).toEqual('field objectId cannot be added');
         done();
       });
   });
@@ -550,7 +550,7 @@ describe('SchemaController', () => {
       )
       .catch(error => {
         expect(error.code).toEqual(136);
-        expect(error.error).toEqual('field localeIdentifier cannot be added');
+        expect(error.message).toEqual('field localeIdentifier cannot be added');
         done();
       });
   });
@@ -565,7 +565,7 @@ describe('SchemaController', () => {
       )
       .catch(error => {
         expect(error.code).toEqual(Parse.Error.INVALID_JSON);
-        expect(error.error).toEqual('invalid JSON');
+        expect(error.message).toEqual('invalid JSON');
         done();
       });
   });
@@ -580,7 +580,7 @@ describe('SchemaController', () => {
       )
       .catch(error => {
         expect(error.code).toEqual(135);
-        expect(error.error).toEqual('type Pointer needs a class name');
+        expect(error.message).toEqual('type Pointer needs a class name');
         done();
       });
   });
@@ -595,7 +595,7 @@ describe('SchemaController', () => {
       )
       .catch(error => {
         expect(error.code).toEqual(Parse.Error.INVALID_JSON);
-        expect(error.error).toEqual('invalid JSON');
+        expect(error.message).toEqual('invalid JSON');
         done();
       });
   });
@@ -610,7 +610,7 @@ describe('SchemaController', () => {
       )
       .catch(error => {
         expect(error.code).toEqual(135);
-        expect(error.error).toEqual('type Relation needs a class name');
+        expect(error.message).toEqual('type Relation needs a class name');
         done();
       });
   });
@@ -625,7 +625,7 @@ describe('SchemaController', () => {
       )
       .catch(error => {
         expect(error.code).toEqual(Parse.Error.INVALID_JSON);
-        expect(error.error).toEqual('invalid JSON');
+        expect(error.message).toEqual('invalid JSON');
         done();
       });
   });
@@ -640,7 +640,7 @@ describe('SchemaController', () => {
       )
       .catch(error => {
         expect(error.code).toEqual(Parse.Error.INVALID_CLASS_NAME);
-        expect(error.error).toEqual(
+        expect(error.message).toEqual(
           'Invalid classname: not a valid class name, classnames can only have alphanumeric characters and _, and must start with an alpha character '
         );
         done();
@@ -657,7 +657,7 @@ describe('SchemaController', () => {
       )
       .catch(error => {
         expect(error.code).toEqual(Parse.Error.INVALID_CLASS_NAME);
-        expect(error.error).toEqual(
+        expect(error.message).toEqual(
           'Invalid classname: not a valid class name, classnames can only have alphanumeric characters and _, and must start with an alpha character '
         );
         done();
@@ -674,7 +674,7 @@ describe('SchemaController', () => {
       )
       .catch(error => {
         expect(error.code).toEqual(Parse.Error.INCORRECT_TYPE);
-        expect(error.error).toEqual('invalid field type: Unknown');
+        expect(error.message).toEqual('invalid field type: Unknown');
         done();
       });
   });
@@ -929,7 +929,7 @@ describe('SchemaController', () => {
       )
       .catch(error => {
         expect(error.code).toEqual(Parse.Error.INCORRECT_TYPE);
-        expect(error.error).toEqual(
+        expect(error.message).toEqual(
           'currently, only one GeoPoint field may exist in an object. Adding geo2 when geo1 already exists.'
         );
         done();