6641: Restructured /loginAs tests to reveal intent better and provide better errors on test failure

Author: gormanfletcher

spec/ParseUser.spec.js

@@ -161,18 +161,17 @@ describe('Parse.User testing', () => {
         },
       });
 
-      const sessionToken = response.data.sessionToken;
-      expect(sessionToken).toBeDefined();
-
-      const sessionsQuery = new Parse.Query(Parse.Session);
-      const sessionsAfterRequest = await sessionsQuery.find({ useMasterKey: true });
-      expect(sessionsAfterRequest.length).toBe(1);
-
-      done();
+      expect(response.data.sessionToken).toBeDefined();
     } catch (err) {
       fail(`no request should fail: ${JSON.stringify(err)}`);
       done();
     }
+
+    const sessionsQuery = new Parse.Query(Parse.Session);
+    const sessionsAfterRequest = await sessionsQuery.find({ useMasterKey: true });
+    expect(sessionsAfterRequest.length).toBe(1);
+
+    done();
   });
 
   it("/loginAs returns an error if a session is requested for a user ID that doesn't exist", async done => {
@@ -191,17 +190,16 @@ describe('Parse.User testing', () => {
       });
 
       fail('Request should fail without a valid user ID');
-
       done();
     } catch (err) {
       expect(err.data.code).toBe(Parse.Error.OBJECT_NOT_FOUND);
+    }
 
-      const sessionsQuery = new Parse.Query(Parse.Session);
-      const sessionsAfterRequest = await sessionsQuery.find({ useMasterKey: true });
-      expect(sessionsAfterRequest.length).toBe(0);
+    const sessionsQuery = new Parse.Query(Parse.Session);
+    const sessionsAfterRequest = await sessionsQuery.find({ useMasterKey: true });
+    expect(sessionsAfterRequest.length).toBe(0);
 
-      done();
-    }
+    done();
   });
 
   it('/loginAs returns an error if a session is requested without specifying a user ID', async done => {
@@ -218,17 +216,16 @@ describe('Parse.User testing', () => {
       });
 
       fail('Request should fail without a valid user ID');
-
       done();
     } catch (err) {
       expect(err.data.code).toBe(Parse.Error.MISSING_OBJECT_ID);
+    }
 
-      const sessionsQuery = new Parse.Query(Parse.Session);
-      const sessionsAfterRequest = await sessionsQuery.find({ useMasterKey: true });
-      expect(sessionsAfterRequest.length).toBe(0);
+    const sessionsQuery = new Parse.Query(Parse.Session);
+    const sessionsAfterRequest = await sessionsQuery.find({ useMasterKey: true });
+    expect(sessionsAfterRequest.length).toBe(0);
 
-      done();
-    }
+    done();
   });
 
   it('/loginAs forbids non-master clients from creating sessions', async done => {
@@ -250,19 +247,16 @@ describe('Parse.User testing', () => {
       });
 
       fail('Request should fail without the master key');
-
       done();
     } catch (err) {
       expect(err.data.code).toBe(Parse.Error.OPERATION_FORBIDDEN);
+    }
 
-      const sessionsQuery = new Parse.Query(Parse.Session);
-      const sessionsAfterRequest = await sessionsQuery.find({ useMasterKey: true });
-      if (sessionsAfterRequest.length !== 0) {
-        fail('Sessions table was modified without the master key');
-      }
+    const sessionsQuery = new Parse.Query(Parse.Session);
+    const sessionsAfterRequest = await sessionsQuery.find({ useMasterKey: true });
+    expect(sessionsAfterRequest.length).toBe(0);
 
-      done();
-    }
+    done();
   });
 
   it('user login', async done => {