Merged with master

2016-02-09 10:23:55 +01:00
parent 307a5d8157
commit 7fa4b3bc07
57 changed files with 325 additions and 109 deletions
--- a/spec/ParseACL.spec.js
+++ b/spec/ParseACL.spec.js
@@ -251,6 +251,9 @@ describe('Parse.ACL', () => {
                    equal(results.length, 1);
                    var result = results[0];
                    ok(result);
+                    if (!result) {
+                      return fail();
+                    }
                    equal(result.id, object.id);
                    equal(result.getACL().getReadAccess(user), true);
                    equal(result.getACL().getWriteAccess(user), true);