From 8053332072243b85487bf3871b23225ef4e4b527 Mon Sep 17 00:00:00 2001
From: Reggie Cushing <r.cushing@esciencecenter.nl>
Date: Thu, 30 May 2024 15:08:45 +0200
Subject: [PATCH] fix unit tests

---
 schedulers/gat-scheduler.js | 2 +-
 server.js                   | 4 ++--
 test/gat-scheduler-test.js  | 3 +++
 user.js                     | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/schedulers/gat-scheduler.js b/schedulers/gat-scheduler.js
index 7c6bcaa..12e492c 100644
--- a/schedulers/gat-scheduler.js
+++ b/schedulers/gat-scheduler.js
@@ -72,7 +72,7 @@ class GatScheduler {
     return Object.values(experiment.servers).some((s) => s.length >= this.min)
   }
 
-  async checkConditionAndReturnUsers(experiments, usedUrls) {
+  checkConditionAndReturnUsers(experiments, usedUrls) {
     // await this.queue.wait()
     const queueSize = this.queue.size()
     const falseCondition = {
diff --git a/server.js b/server.js
index 455a5df..99dd27a 100644
--- a/server.js
+++ b/server.js
@@ -260,7 +260,7 @@ function agreeGame(users, uuid, agreement, usersDb) {
   }
 }
 
-async function startReadyGames(experiments, agreementIds, usersDb) {
+function startReadyGames(experiments, agreementIds, usersDb) {
   for (const [experimentId, _] of Object.entries(experiments)) {
     const experiment = experiments[experimentId]
     const scheduler = experiment.scheduler
@@ -276,7 +276,7 @@ async function startReadyGames(experiments, agreementIds, usersDb) {
     let canMaybeScheduleNext = true
     while (canMaybeScheduleNext) {
       canMaybeScheduleNext = false
-      const conditionObject = await scheduler.checkConditionAndReturnUsers(
+      const conditionObject = scheduler.checkConditionAndReturnUsers(
         experiments,
         usedUrls,
       )
diff --git a/test/gat-scheduler-test.js b/test/gat-scheduler-test.js
index b4b96d6..99f3be9 100644
--- a/test/gat-scheduler-test.js
+++ b/test/gat-scheduler-test.js
@@ -29,6 +29,7 @@ test("test GAT scheduler with enough rooms", () => {
     },
   )
   users.forEach((user) => {
+    user.changeState("queued")
     scheduler.queueUser(user)
   })
   assert.strictEqual(scheduler.queue.size(), 7)
@@ -92,6 +93,7 @@ test("test GAT scheduler without enough rooms", () => {
     },
   )
   users.forEach((user) => {
+    user.changeState("queued")
     scheduler.queueUser(user)
   })
   assert.strictEqual(scheduler.queue.size(), 7)
@@ -145,6 +147,7 @@ test("test GAT scheduler with used URLs", () => {
     return new User(userId, experimentName)
   })
   users.forEach((user) => {
+    user.changeState("queued")
     scheduler.queueUser(user)
   })
   assert.strictEqual(scheduler.queue.size(), 3)
diff --git a/user.js b/user.js
index f83bb28..1442801 100644
--- a/user.js
+++ b/user.js
@@ -45,7 +45,7 @@ class User {
   reset() {
     if (this.state === "inoTreePages") {
       console.log(
-        `[${this.userId}] Resetting user while in state ${this.state}.`
+        `[${this.userId}] Resetting user while in state ${this.state}.`,
       )
     }
     this.state = "startedPage"