reconfigure username/email tests

Author: drew-gross

spec/ParseAPI.spec.js

@@ -10,7 +10,6 @@ let defaultColumns = require('../src/Controllers/SchemaController').defaultColum
 
 const requiredUserFields = { fields: Object.assign({}, defaultColumns._Default, defaultColumns._User) };
 
-
 fdescribe('miscellaneous', function() {
   it('create a GameScore object', function(done) {
     var obj = new Parse.Object('GameScore');
@@ -50,37 +49,40 @@ fdescribe('miscellaneous', function() {
   });
 
   it('fail to create a duplicate username', done => {
-    let numCreated = 0;
-    let numFailed = 0;
-    let p1 = createTestUser();
-    p1.then(user => {
-      numCreated++;
-      expect(numCreated).toEqual(1);
-    })
-    .catch(error => {
-      numFailed++;
-      expect(numFailed).toEqual(1);
-      expect(error.code).toEqual(Parse.Error.USERNAME_TAKEN);
-    });
-    let p2 = createTestUser();
-    p2.then(user => {
-      numCreated++;
-      expect(numCreated).toEqual(1);
-    })
-    .catch(error => {
-      numFailed++;
-      expect(numFailed).toEqual(1);
-      expect(error.code).toEqual(Parse.Error.USERNAME_TAKEN);
-    });
-    Parse.Promise.all([p1, p2])
+    DatabaseAdapter._indexBuildsCompleted('test')
     .then(() => {
-      fail('one of the users should not have been created');
-      done();
-    })
-    .catch(done);
+      let numCreated = 0;
+      let numFailed = 0;
+      let p1 = createTestUser();
+      p1.then(user => {
+        numCreated++;
+        expect(numCreated).toEqual(1);
+      })
+      .catch(error => {
+        numFailed++;
+        expect(numFailed).toEqual(1);
+        expect(error.code).toEqual(Parse.Error.USERNAME_TAKEN);
+      });
+      let p2 = createTestUser();
+      p2.then(user => {
+        numCreated++;
+        expect(numCreated).toEqual(1);
+      })
+      .catch(error => {
+        numFailed++;
+        expect(numFailed).toEqual(1);
+        expect(error.code).toEqual(Parse.Error.USERNAME_TAKEN);
+      });
+      Parse.Promise.all([p1, p2])
+      .then(() => {
+        fail('one of the users should not have been created');
+        done();
+      })
+      .catch(done);
+    });
   });
 
-  fit('ensure that email is uniquely indexed', done => {
+  it('ensure that email is uniquely indexed', done => {
     DatabaseAdapter._indexBuildsCompleted('test')
     .then(() => {
       let numCreated = 0;
@@ -96,7 +98,6 @@ fdescribe('miscellaneous', function() {
         expect(numCreated).toEqual(1);
       }, error => {
         numFailed++;
-        console.log(error);
         expect(numFailed).toEqual(1);
         expect(error.code).toEqual(Parse.Error.EMAIL_TAKEN);
       });
@@ -111,7 +112,6 @@ fdescribe('miscellaneous', function() {
         expect(numCreated).toEqual(1);
       }, error => {
         numFailed++;
-        console.log(error);
         expect(numFailed).toEqual(1);
         expect(error.code).toEqual(Parse.Error.EMAIL_TAKEN);
       });

spec/helper.js

@@ -56,9 +56,6 @@ var currentConfiguration;
 // Allows testing specific configurations of Parse Server
 const setServerConfiguration = configuration => {
   // the configuration hasn't changed
-  if (configuration === currentConfiguration) {
-    return;
-  }
   DatabaseAdapter.clearDatabaseSettings();
   currentConfiguration = configuration;
   server.close();
@@ -80,11 +77,14 @@ Parse.serverURL = 'http://localhost:' + port + '/1';
 Parse.Promise.disableAPlusCompliant();
 
 beforeEach(function(done) {
-  restoreServerConfiguration();
-  Parse.initialize('test', 'test', 'test');
-  Parse.serverURL = 'http://localhost:' + port + '/1';
-  Parse.User.enableUnsafeCurrentUser();
-  return TestUtils.destroyAllDataPermanently().then(done, fail);
+  TestUtils.destroyAllDataPermanently()
+  .then(() => {
+    restoreServerConfiguration();
+    Parse.initialize('test', 'test', 'test');
+    Parse.serverURL = 'http://localhost:' + port + '/1';
+    Parse.User.enableUnsafeCurrentUser();
+    done();
+  }, fail)
 });
 
 var mongoAdapter = new MongoStorageAdapter({
@@ -111,7 +111,7 @@ afterEach(function(done) {
   })
   .then(() => Parse.User.logOut())
   .then(() => {
-    //return TestUtils.destroyAllDataPermanently();
+    return TestUtils.destroyAllDataPermanently();
   }).then(() => {
     done();
   }, (error) => {

src/DatabaseAdapter.js

@@ -41,6 +41,7 @@ function clearDatabaseSettings() {
   appDatabaseURIs = {};
   dbConnections = {};
   appDatabaseOptions = {};
+  indexBuildCreationPromises = {};
 }
 
 //Used by tests
@@ -87,42 +88,7 @@ function getDatabaseConnection(appId: string, collectionPrefix: string) {
     return Promise.reject();
   })
 
-  indexBuildCreationPromises[appId] = p1.then(() => p2)
-  .then(() => console.log('index build success'))
-  .then(() => {
-    let numCreated = 0;
-    let numFailed = 0;
-
-    let user1 = new Parse.User();
-    user1.setPassword('asdf');
-    user1.setUsername('u1');
-    user1.setEmail('[email protected]');
-    let p1 = user1.signUp();
-    p1.then(user => {
-      numCreated++;
-      console.log(numCreated)
-    }, error => {
-      numFailed++;
-      console.log(error);
-      console.log(numFailed)
-      console.log(error.code)
-    });
-
-    let user2 = new Parse.User();
-    user2.setPassword('asdf');
-    user2.setUsername('u2');
-    user2.setEmail('[email protected]');
-    let p2 = user2.signUp();
-    p2.then(user => {
-      numCreated++;
-      console.log(numCreated)
-    }, error => {
-      numFailed++;
-      console.log(error);
-      console.log(numFailed)
-      console.log(error.code)
-    });
-  })
+  indexBuildCreationPromises[appId] = Promise.all([p1, p2])
 
   return dbConnections[appId];
 }

src/middlewares.js

@@ -235,7 +235,6 @@ var handleParseErrors = function(err, req, res, next) {
     }
 
     res.status(httpStatus);
-    console.log(err);
     res.json({code: err.code, error: err.message});
   } else if (err.status && err.message) {
     res.status(err.status);