Merge branch 'dev' into prod

UofT-Frosh-Orientation · Jul 5, 2024 · 149987e · 149987e
2 parents 2fdcb59 + 07ebe67
commit 149987e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 18 deletions.
diff --git a/server/test/services/FroshServices.test.js b/server/test/services/FroshServices.test.js
@@ -103,8 +103,7 @@ describe('FroshServices', () => {
       emergencyContactRelationship: 'test',
       emergencyContactNumber: '000-000-0000',
       attendingScunt: true,
-      summerLocationCity: 'Toronto',
-      summerLocationCountry: 'Canada',
+      summerLocationQuery: true,
       photograph: true,
       froshGroup: 'alpha',
       froshGroupIcon: 'α',

diff --git a/server/test/services/PaymentServices.test.js b/server/test/services/PaymentServices.test.js
@@ -41,8 +41,7 @@ describe('PaymentServices', () => {
       emergencyContactNumber: 'test',
       bursaryRequested: false,
       attendingScunt: true,
-      summerLocationCity: 'test',
-      summerLocationCountry: 'test',
+      summerLocationQuery: true,
       photograph: true,
       froshGroup: 'test',
       isRegistered: false,
@@ -84,8 +83,7 @@ describe('PaymentServices', () => {
       emergencyContactNumber: 'test',
       bursaryRequested: false,
       attendingScunt: true,
-      summerLocationCity: 'test',
-      summerLocationCountry: 'test',
+      summerLocationQuery: true,
       photograph: true,
       froshGroup: 'test',
       isRegistered: true,
@@ -129,8 +127,7 @@ describe('PaymentServices', () => {
       emergencyContactNumber: 'test',
       bursaryRequested: false,
       attendingScunt: true,
-      summerLocationCity: 'test',
-      summerLocationCountry: 'test',
+      summerLocationQuery: true,
       photograph: true,
       froshGroup: 'none',
       isRegistered: false,
@@ -167,8 +164,7 @@ describe('PaymentServices', () => {
       emergencyContactNumber: 'test',
       bursaryRequested: false,
       attendingScunt: true,
-      summerLocationCity: 'test',
-      summerLocationCountry: 'test',
+      summerLocationQuery: true,
       photograph: true,
       froshGroup: 'none',
       isRegistered: false,
@@ -208,8 +204,7 @@ describe('PaymentServices', () => {
       emergencyContactNumber: 'test',
       bursaryRequested: false,
       attendingScunt: true,
-      summerLocationCity: 'test',
-      summerLocationCountry: 'test',
+      summerLocationQuery: true,
       photograph: true,
       froshGroup: 'none',
       isRegistered: false,
@@ -241,8 +236,7 @@ describe('PaymentServices', () => {
       emergencyContactNumber: 'test',
       bursaryRequested: false,
       attendingScunt: true,
-      summerLocationCity: 'test',
-      summerLocationCountry: 'test',
+      summerLocationQuery: true,
       photograph: true,
       froshGroup: 'none',
       isRegistered: false,
@@ -279,8 +273,7 @@ describe('PaymentServices', () => {
       emergencyContactNumber: 'test',
       bursaryRequested: false,
       attendingScunt: true,
-      summerLocationCity: 'test',
-      summerLocationCountry: 'test',
+      summerLocationQuery: true,
       photograph: true,
       froshGroup: 'none',
       isRegistered: false,

diff --git a/server/test/services/ScuntTeamServices.test.js b/server/test/services/ScuntTeamServices.test.js
@@ -488,8 +488,7 @@ describe('ScuntTeamServices', () => {
         emergencyContactNumber: 'test',
         bursaryRequested: false,
         attendingScunt: true,
-        summerLocationCity: 'test',
-        summerLocationCountry: 'test',
+        summerLocationQuery: true,
         photograph: true,
         froshGroup: 'test',
         isRegistered: true,