Merged with master

spec/APNS.spec.js

@@ -1,4 +1,4 @@
-var APNS = require('../APNS');
+var APNS = require('../src/APNS');
 
 describe('APNS', () => {
   it('can generate APNS notification', (done) => {

spec/ExportAdapter.spec.js

@@ -1,4 +1,4 @@
-var ExportAdapter = require('../ExportAdapter');
+var ExportAdapter = require('../src/ExportAdapter');
 
 describe('ExportAdapter', () => {
   it('can be constructed', (done) => {

spec/GCM.spec.js

@@ -1,4 +1,4 @@
-var GCM = require('../GCM');
+var GCM = require('../src/GCM');
 
 describe('GCM', () => {
   it('can generate GCM Payload without expiration time', (done) => {

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);

spec/ParseAPI.spec.js

@@ -1,7 +1,7 @@
 // A bunch of different tests are in here - it isn't very thematic.
 // It would probably be better to refactor them into different files.
 
-var DatabaseAdapter = require('../DatabaseAdapter');
+var DatabaseAdapter = require('../src/DatabaseAdapter');
 var request = require('request');
 
 describe('miscellaneous', function() {

spec/ParseInstallation.spec.js

@@ -1,12 +1,12 @@
 // These tests check the Installations functionality of the REST API.
 // Ported from installation_collection_test.go
 
-var auth = require('../Auth');
-var cache = require('../cache');
-var Config = require('../Config');
-var DatabaseAdapter = require('../DatabaseAdapter');
+var auth = require('../src/Auth');
+var cache = require('../src/cache');
+var Config = require('../src/Config');
+var DatabaseAdapter = require('../src/DatabaseAdapter');
 var Parse = require('parse/node').Parse;
-var rest = require('../rest');
+var rest = require('../src/rest');
 
 var config = new Config('test');
 var database = DatabaseAdapter.getDatabaseConnection('test');

spec/ParseQuery.spec.js

@@ -2056,7 +2056,7 @@ describe('Parse.Query testing', () => {
     });
   });
 
-  it('query match on array value', (done) => {
+  it('query match on array with single object', (done) => {
     var target = {__type: 'Pointer', className: 'TestObject', objectId: 'abc123'};
     var obj = new Parse.Object('TestObject');
     obj.set('someObjs', [target]);
@@ -2072,4 +2072,20 @@ describe('Parse.Query testing', () => {
     });
   });
 
+  it('query match on array with multiple objects', (done) => {
+    var target1 = {__type: 'Pointer', className: 'TestObject', objectId: 'abc'};
+    var target2 = {__type: 'Pointer', className: 'TestObject', objectId: '123'};
+    var obj= new Parse.Object('TestObject');
+    obj.set('someObjs', [target1, target2]);
+    obj.save().then(() => {
+      var query = new Parse.Query('TestObject');
+      query.equalTo('someObjs', target1);
+      return query.find();
+    }).then((results) => {
+      expect(results.length).toEqual(1);
+      done();
+    }, (error) => {
+      console.log(error);
+    });
+  });
 });

spec/ParseUser.spec.js

@@ -6,7 +6,7 @@
 // Tests that involve sending password reset emails.
 
 var request = require('request');
-var passwordCrypto = require('../password');
+var passwordCrypto = require('../src/password');
 
 describe('Parse.User testing', () => {
   it("user sign up class method", (done) => {

spec/RestCreate.spec.js

@@ -1,10 +1,10 @@
 // These tests check the "create" functionality of the REST API.
-var auth = require('../Auth');
-var cache = require('../cache');
-var Config = require('../Config');
-var DatabaseAdapter = require('../DatabaseAdapter');
+var auth = require('../src/Auth');
+var cache = require('../src/cache');
+var Config = require('../src/Config');
+var DatabaseAdapter = require('../src/DatabaseAdapter');
 var Parse = require('parse/node').Parse;
-var rest = require('../rest');
+var rest = require('../src/rest');
 var request = require('request');
 
 var config = new Config('test');

spec/RestQuery.spec.js

@@ -1,8 +1,8 @@
 // These tests check the "find" functionality of the REST API.
-var auth = require('../Auth');
-var cache = require('../cache');
-var Config = require('../Config');
-var rest = require('../rest');
+var auth = require('../src/Auth');
+var cache = require('../src/cache');
+var Config = require('../src/Config');
+var rest = require('../src/rest');
 
 var config = new Config('test');
 var nobody = auth.nobody(config);

spec/Schema.spec.js

@@ -1,6 +1,6 @@
 // These tests check that the Schema operates correctly.
-var Config = require('../Config');
-var Schema = require('../Schema');
+var Config = require('../src/Config');
+var Schema = require('../src/Schema');
 var dd = require('deep-diff');
 
 var config = new Config('test');
@@ -252,7 +252,7 @@ describe('Schema', () => {
   it('refuses to add fields with invalid pointer types', done => {
     config.database.loadSchema()
     .then(schema => schema.addClassIfNotExists('NewClass', {
-      foo: {type: 'Pointer'},
+      foo: {type: 'Pointer'}
     }))
     .catch(error => {
       expect(error.code).toEqual(135);
@@ -398,7 +398,7 @@ describe('Schema', () => {
     config.database.loadSchema()
     .then(schema => schema.addClassIfNotExists('NewClass', {
       geo1: {type: 'GeoPoint'},
-      geo2: {type: 'GeoPoint'},
+      geo2: {type: 'GeoPoint'}
     }))
     .catch(error => {
       expect(error.code).toEqual(Parse.Error.INCORRECT_TYPE);

spec/helper.js

@@ -2,11 +2,11 @@
 
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 2000;
 
-var cache = require('../cache');
-var DatabaseAdapter = require('../DatabaseAdapter');
+var cache = require('../src/cache');
+var DatabaseAdapter = require('../src/DatabaseAdapter');
 var express = require('express');
-var facebook = require('../facebook');
-var ParseServer = require('../index').ParseServer;
+var facebook = require('../src/facebook');
+var ParseServer = require('../src/index').ParseServer;
 
 var databaseURI = process.env.DATABASE_URI;
 var cloudMain = process.env.CLOUD_CODE_MAIN || './cloud/main.js';

spec/push.spec.js

@@ -1,4 +1,4 @@
-var push = require('../push');
+var push = require('../src/push');
 
 describe('push', () => {
   it('can check valid master key of request', (done) => {

spec/schemas.spec.js

@@ -1,5 +1,7 @@
+var Parse = require('parse/node').Parse;
 var request = require('request');
 var dd = require('deep-diff');
+
 var hasAllPODobject = () => {
   var obj = new Parse.Object('HasAllPOD');
   obj.set('aNumber', 5);
@@ -14,9 +16,9 @@ var hasAllPODobject = () => {
   objACL.setPublicWriteAccess(false);
   obj.setACL(objACL);
   return obj;
-}
+};
 
-var expectedResponseForHasAllPOD = {
+var plainOldDataSchema = {
   className: 'HasAllPOD',
   fields: {
     //Default fields
@@ -33,10 +35,10 @@ var expectedResponseForHasAllPOD = {
     aArray: {type: 'Array'},
     aGeoPoint: {type: 'GeoPoint'},
     aFile: {type: 'File'}
-  },
+  }
 };
 
-var expectedResponseforHasPointersAndRelations = {
+var pointersAndRelationsSchema = {
   className: 'HasPointersAndRelations',
   fields: {
     //Default fields
@@ -56,17 +58,30 @@ var expectedResponseforHasPointersAndRelations = {
   },
 }
 
+var noAuthHeaders = {
+  'X-Parse-Application-Id': 'test',
+};
+
+var restKeyHeaders = {
+  'X-Parse-Application-Id': 'test',
+  'X-Parse-REST-API-Key': 'rest',
+};
+
+var masterKeyHeaders = {
+  'X-Parse-Application-Id': 'test',
+  'X-Parse-Master-Key': 'test',
+};
+
 describe('schemas', () => {
   it('requires the master key to get all schemas', (done) => {
     request.get({
       url: 'http://localhost:8378/1/schemas',
       json: true,
-      headers: {
-        'X-Parse-Application-Id': 'test',
-        'X-Parse-REST-API-Key': 'rest',
-      },
+      headers: noAuthHeaders,
     }, (error, response, body) => {
-      expect(response.statusCode).toEqual(401);
+      //api.parse.com uses status code 401, but due to the lack of keys
+      //being necessary in parse-server, 403 makes more sense
+      expect(response.statusCode).toEqual(403);
       expect(body.error).toEqual('unauthorized');
       done();
     });
@@ -76,10 +91,7 @@ describe('schemas', () => {
     request.get({
       url: 'http://localhost:8378/1/schemas/SomeSchema',
       json: true,
-      headers: {
-        'X-Parse-Application-Id': 'test',
-        'X-Parse-REST-API-Key': 'rest',
-      },
+      headers: restKeyHeaders,
     }, (error, response, body) => {
       expect(response.statusCode).toEqual(401);
       expect(body.error).toEqual('unauthorized');
@@ -87,14 +99,23 @@ describe('schemas', () => {
     });
   });
 
+  it('asks for the master key if you use the rest key', (done) => {
+    request.get({
+      url: 'http://localhost:8378/1/schemas',
+      json: true,
+      headers: restKeyHeaders,
+    }, (error, response, body) => {
+      expect(response.statusCode).toEqual(401);
+      expect(body.error).toEqual('master key not specified');
+      done();
+    });
+  });
+
   it('responds with empty list when there are no schemas', done => {
     request.get({
       url: 'http://localhost:8378/1/schemas',
       json: true,
-      headers: {
-        'X-Parse-Application-Id': 'test',
-        'X-Parse-Master-Key': 'test',
-      },
+      headers: masterKeyHeaders,
     }, (error, response, body) => {
       expect(body.results).toEqual([]);
       done();
@@ -113,13 +134,10 @@ describe('schemas', () => {
       request.get({
         url: 'http://localhost:8378/1/schemas',
         json: true,
-        headers: {
-          'X-Parse-Application-Id': 'test',
-          'X-Parse-Master-Key': 'test',
-        },
+        headers: masterKeyHeaders,
       }, (error, response, body) => {
         var expected = {
-          results: [expectedResponseForHasAllPOD,expectedResponseforHasPointersAndRelations]
+          results: [plainOldDataSchema,pointersAndRelationsSchema]
         };
         expect(body).toEqual(expected);
         done();
@@ -133,12 +151,9 @@ describe('schemas', () => {
       request.get({
         url: 'http://localhost:8378/1/schemas/HasAllPOD',
         json: true,
-        headers: {
-          'X-Parse-Application-Id': 'test',
-          'X-Parse-Master-Key': 'test',
-        },
+        headers: masterKeyHeaders,
       }, (error, response, body) => {
-        expect(body).toEqual(expectedResponseForHasAllPOD);
+        expect(body).toEqual(plainOldDataSchema);
         done();
       });
     });
@@ -150,10 +165,7 @@ describe('schemas', () => {
       request.get({
         url: 'http://localhost:8378/1/schemas/HASALLPOD',
         json: true,
-        headers: {
-          'X-Parse-Application-Id': 'test',
-          'X-Parse-Master-Key': 'test',
-        },
+        headers: masterKeyHeaders,
       }, (error, response, body) => {
         expect(response.statusCode).toEqual(400);
         expect(body).toEqual({
@@ -164,4 +176,146 @@ describe('schemas', () => {
       });
     });
   });
+
+  it('requires the master key to create a schema', done => {
+    request.post({
+      url: 'http://localhost:8378/1/schemas',
+      json: true,
+      headers: noAuthHeaders,
+      body: {
+        className: 'MyClass',
+      }
+    }, (error, response, body) => {
+      expect(response.statusCode).toEqual(403);
+      expect(body.error).toEqual('unauthorized');
+      done();
+    });
+  });
+
+  it('asks for the master key if you use the rest key', done => {
+    request.post({
+      url: 'http://localhost:8378/1/schemas',
+      json: true,
+      headers: restKeyHeaders,
+      body: {
+        className: 'MyClass',
+      },
+    }, (error, response, body) => {
+      expect(response.statusCode).toEqual(401);
+      expect(body.error).toEqual('master key not specified');
+      done();
+    });
+  });
+
+  it('sends an error if you use mismatching class names', done => {
+    request.post({
+      url: 'http://localhost:8378/1/schemas/A',
+      headers: masterKeyHeaders,
+      json: true,
+      body: {
+        className: 'B',
+      }
+    }, (error, response, body) => {
+      expect(response.statusCode).toEqual(400);
+      expect(body).toEqual({
+        code: Parse.Error.INVALID_CLASS_NAME,
+        error: 'class name mismatch between B and A',
+      });
+      done();
+    });
+  });
+
+  it('sends an error if you use no class name', done => {
+    request.post({
+      url: 'http://localhost:8378/1/schemas',
+      headers: masterKeyHeaders,
+      json: true,
+      body: {},
+    }, (error, response, body) => {
+      expect(response.statusCode).toEqual(400);
+      expect(body).toEqual({
+        code: 135,
+        error: 'POST /schemas needs class name',
+      });
+      done();
+    })
+  });
+
+  it('sends an error if you try to create the same class twice', done => {
+    request.post({
+      url: 'http://localhost:8378/1/schemas',
+      headers: masterKeyHeaders,
+      json: true,
+      body: {
+        className: 'A',
+      },
+    }, (error, response, body) => {
+      expect(error).toEqual(null);
+      request.post({
+        url: 'http://localhost:8378/1/schemas',
+        headers: masterKeyHeaders,
+        json: true,
+        body: {
+          className: 'A',
+        }
+      }, (error, response, body) => {
+        expect(response.statusCode).toEqual(400);
+        expect(body).toEqual({
+          code: Parse.Error.INVALID_CLASS_NAME,
+          error: 'class A already exists',
+        });
+        done();
+      });
+    });
+  });
+
+  it('responds with all fields when you create a class', done => {
+    request.post({
+      url: 'http://localhost:8378/1/schemas',
+      headers: masterKeyHeaders,
+      json: true,
+      body: {
+        className: "NewClass",
+        fields: {
+          foo: {type: 'Number'},
+          ptr: {type: 'Pointer', targetClass: 'SomeClass'}
+        }
+      }
+    }, (error, response, body) => {
+      expect(body).toEqual({
+        className: 'NewClass',
+        fields: {
+          ACL: {type: 'ACL'},
+          createdAt: {type: 'Date'},
+          updatedAt: {type: 'Date'},
+          objectId: {type: 'String'},
+          foo: {type: 'Number'},
+          ptr: {type: 'Pointer', targetClass: 'SomeClass'},
+        }
+      });
+      done();
+    });
+  });
+
+  it('lets you specify class name in both places', done => {
+    request.post({
+      url: 'http://localhost:8378/1/schemas/NewClass',
+      headers: masterKeyHeaders,
+      json: true,
+      body: {
+        className: "NewClass",
+      }
+    }, (error, response, body) => {
+      expect(body).toEqual({
+        className: 'NewClass',
+        fields: {
+          ACL: {type: 'ACL'},
+          createdAt: {type: 'Date'},
+          updatedAt: {type: 'Date'},
+          objectId: {type: 'String'},
+        }
+      });
+      done();
+    });
+  });
 });

spec/support/jasmine.json

@@ -4,7 +4,7 @@
     "*spec.js"
   ],
   "helpers": [
+    "../node_modules/babel-core/register.js",
     "helper.js"
   ]
 }
-

spec/transform.spec.js

@@ -1,6 +1,6 @@
 // These tests are unit tests designed to only test transform.js.
 
-var transform = require('../transform');
+var transform = require('../src/transform');
 
 var dummySchema = {
     data: {},