fix account tests

Author: YiFeiZhang2

constants/general.constant.js

@@ -141,5 +141,5 @@ module.exports = {
     CACHE_TIMEOUT_STATS: CACHE_TIMEOUT_STATS,
     CACHE_KEY_STATS: CACHE_KEY_STATS,
     MAX_TEAM_SIZE: MAX_TEAM_SIZE,
-    SAMPLE_DIET_RESTRICTIONS,
+    SAMPLE_DIET_RESTRICTIONS: SAMPLE_DIET_RESTRICTIONS,
 };

tests/account.test.js

@@ -28,13 +28,13 @@ const resetToken = util.reset.ResetToken;
 const Admin0 = util.account.staffAccounts.stored[0];
 const teamHackerAccount0 = util.account.hackerAccounts.stored.team[0];
 
-
-
-
 //This account has a confirmation token in the db
-const storedAccount2 = util.account.NonConfirmedAccount1;
+const storedAccount1 = util.account.NonConfirmedAccount1;
+const storedAccount2 = util.account.NonConfirmedAccount2;
+
 //This account does not have a confirmation token in the DB
-const storedAccount3 = util.account.NonConfirmedAccount2;
+const storedAccount3 = util.account.NonConfirmedAccount3;
+
 // admin role binding
 
 const newAccount0 = util.account.unlinkedAccounts.new[0];
@@ -183,15 +183,15 @@ describe("POST create account", function () {
         chai.request(server.app)
             .post(`/api/account/`)
             .type("application/json")
-            .send(teamHackerAccount0)
+            .send(newAccount0)
             .end(function (err, res) {
                 res.should.have.status(200);
                 res.should.be.json;
                 res.body.should.have.property("message");
                 res.body.message.should.equal(Constants.Success.ACCOUNT_CREATE);
 
                 // use acc.toStrippedJSON to deal with hidden passwords and convert _id to id
-                const acc = (new Account(teamHackerAccount0)).toStrippedJSON();
+                const acc = (new Account(newAccount0)).toStrippedJSON();
                 // delete id as those are generated
                 delete acc.id;
                 delete res.body.data.id;
@@ -470,7 +470,7 @@ describe("GET retrieve permissions", function () {
 
 describe("GET resend confirmation email", function () {
     it("should SUCCEED and resend the confirmation email", function (done) {
-        util.auth.login(agent, storedAccount3, (error) => {
+        util.auth.login(agent, storedAccount1, (error) => {
             if (error) {
                 agent.close();
                 return done(error);
@@ -506,7 +506,7 @@ describe("GET resend confirmation email", function () {
         });
     });
     it("should FAIL as account confirmation token does not exist", function (done) {
-        util.auth.login(agent, storedAccount2, (error) => {
+        util.auth.login(agent, storedAccount3, (error) => {
             if (error) {
                 agent.close();
                 return done(error);

tests/util/account.test.util.js

@@ -48,7 +48,7 @@ function generateRandomValue(atr) {
         case "password":
             return Math.random().toString(36).substr(0, 10);
         case "dietaryRestrictions":
-            return Constants.SAMPLE_DIET_RESTRICTIONS[Math.floor(Math.random() * Constants.SAMPLE_DIET_RESTRICTIONS.length)];
+            return [Constants.SAMPLE_DIET_RESTRICTIONS[Math.floor(Math.random() * Constants.SAMPLE_DIET_RESTRICTIONS.length)]];
         case "shirtSize":
             return Constants.SHIRT_SIZES[Math.floor(Math.random() * Constants.SHIRT_SIZES.length)];
         case "confirmed":
@@ -96,11 +96,12 @@ function createNAccounts(n, acc = {}) {
 
 let hackerAccounts = {
     new: createNAccounts(10, {
-        "accountType": Constants.HACKER
+        "accountType": Constants.HACKER,
     }),
     stored: {
         team: createNAccounts(10, {
-            "accountType": Constants.HACKER
+            "accountType": Constants.HACKER,
+            "confirmed": true,
         }),
         noTeam: createNAccounts(10, {
             "accountType": Constants.HACKER
@@ -131,7 +132,8 @@ let staffAccounts = {
 
 let sponsorT1Accounts = {
     new: createNAccounts(5, {
-        "accountType": Constants.SPONSOR_T1
+        "accountType": Constants.SPONSOR_T1,
+        "confirmed": false,
     }),
     stored: createNAccounts(5, {
         "accountType": Constants.SPONSOR_T1
@@ -206,7 +208,7 @@ const waitlistedHacker0 = {
     "firstName": "abcd",
     "lastName": "defg3",
     "pronoun": "They/Them",
-    "email": "abc.def7@blahblah.com",
+    "email": "waitlisted1@blahblah.com",
     "password": "probsShouldBeHashed2",
     "dietaryRestrictions": ["vegetarian"],
     "shirtSize": "M",
@@ -222,7 +224,7 @@ const NonConfirmedAccount1 = {
     "firstName": "LMAO",
     "lastName": "ROFL",
     "pronoun": "Ey/Em",
-    "email": "abc.def6@blahblah.com",
+    "email": "notconfirmed1@blahblah.com",
     "password": "probsShouldBeHashed5",
     "dietaryRestrictions": ["something1", "something2"],
     "shirtSize": "XXL",
@@ -246,7 +248,8 @@ const NonConfirmedAccount2 = {
 
 const NonConfirmedAccount3 = createAccount({
     "confirmed": false,
-    "accountType": Constants.HACKER
+    "accountType": Constants.HACKER,
+    "email": "notconfirmed3@blahblah.com"
 });
 
 const extraAccounts = [waitlistedHacker0, NonConfirmedAccount1, NonConfirmedAccount2, NonConfirmedAccount3];

tests/util/accountConfirmation.test.util.js

@@ -16,9 +16,9 @@ const logger = require("../../services/logger.service");
 
 const HackerConfirmation = {
     "_id": mongoose.Types.ObjectId(),
-    "accountId": Util.Account.hackerAccounts.stored.noTeam[0],
+    "accountId": Util.Account.NonConfirmedAccount1._id,
     "accountType": Constants.HACKER,
-    "email": Util.Account.hackerAccounts.stored.noTeam[0].email
+    "email": Util.Account.NonConfirmedAccount1.email
 };
 
 const HackerConfirmation2 = {

tests/util/resetPassword.test.util.js

@@ -14,7 +14,7 @@ const logger = require("../../services/logger.service");
 
 const ResetPasswordToken1 = {
     "_id": mongoose.Types.ObjectId(),
-    "accountId": Util.Account.hackerAccounts.stored.team[0]
+    "accountId": Util.Account.hackerAccounts.stored.team[0]._id
 };
 
 const ResetToken = Services.resetPassword.generateToken(ResetPasswordToken1._id, ResetPasswordToken1.accountId);