fix: Failing tests

- Bump planx-core - Add missing team_settings queries - Add reference_code for BOPS e2e tests
theopensystemslab · Jul 15, 2024 · 7797a79 · 7797a79
1 parent e1a7a06
commit 7797a79
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 25 deletions.
diff --git a/api.planx.uk/modules/pay/service/inviteToPay/sendPaymentEmail.ts b/api.planx.uk/modules/pay/service/inviteToPay/sendPaymentEmail.ts
@@ -74,7 +74,16 @@ const validatePaymentRequest = async (
                 name
                 slug
                 domain
-                settings: team_settings
+                settings: team_settings {
+                  boundaryUrl: boundary_url
+                  boundaryBBox: boundary_bbox
+                  homepage
+                  helpEmail: help_email
+                  helpPhone: help_phone
+                  helpOpeningHours: help_opening_hours
+                  emailReplyToId: email_reply_to_id
+                  boundaryBBox: boundary_bbox
+                }
               }
             }
           }

diff --git a/api.planx.uk/modules/saveAndReturn/service/resumeApplication.ts b/api.planx.uk/modules/saveAndReturn/service/resumeApplication.ts
@@ -66,7 +66,16 @@ const validateRequest = async (
         teams(where: { slug: { _eq: $teamSlug } }) {
           slug
           name
-          settings: team_settings
+          settings: team_settings {
+            boundaryUrl: boundary_url
+            boundaryBBox: boundary_bbox
+            homepage
+            helpEmail: help_email
+            helpPhone: help_phone
+            helpOpeningHours: help_opening_hours
+            emailReplyToId: email_reply_to_id
+            boundaryBBox: boundary_bbox
+          }
           domain
         }
       }

diff --git a/api.planx.uk/package.json b/api.planx.uk/package.json
@@ -5,7 +5,7 @@
   "packageManager": "[email protected]",
   "dependencies": {
     "@airbrake/node": "^2.1.8",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d99d371",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#0006ebd",
     "@types/isomorphic-fetch": "^0.0.36",
     "adm-zip": "^0.5.10",
     "aws-sdk": "^2.1467.0",

diff --git a/api.planx.uk/pnpm-lock.yaml b/api.planx.uk/pnpm-lock.yaml
diff --git a/e2e/tests/api-driven/package.json b/e2e/tests/api-driven/package.json
@@ -7,7 +7,7 @@
   "packageManager": "[email protected]",
   "dependencies": {
     "@cucumber/cucumber": "^9.3.0",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d99d371",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#0006ebd",
     "axios": "^1.6.8",
     "dotenv": "^16.3.1",
     "dotenv-expand": "^10.0.0",

diff --git a/e2e/tests/api-driven/pnpm-lock.yaml b/e2e/tests/api-driven/pnpm-lock.yaml
diff --git a/e2e/tests/api-driven/src/globalHelpers.ts b/e2e/tests/api-driven/src/globalHelpers.ts
@@ -11,7 +11,6 @@ export function createTeam(
       submissionEmail: TEST_EMAIL,
       settings: {
         homepage: "http://www.planx.uk",
-        referenceCode: "ABCD",
       },
       ...args,
     }),

diff --git a/e2e/tests/api-driven/src/invite-to-pay/helpers.ts b/e2e/tests/api-driven/src/invite-to-pay/helpers.ts
@@ -186,7 +186,7 @@ const setupMockBopsSubmissionUrl = async (teamId: number) => {
 
 export const setup = async () => {
   await setUpMocks();
-  const teamId = await createTeam();
+  const teamId = await createTeam({ settings: { referenceCode: "ABC" }});
   const userId = await createUser();
   await setupMockBopsSubmissionUrl(teamId);
 

diff --git a/e2e/tests/ui-driven/package.json b/e2e/tests/ui-driven/package.json
@@ -8,7 +8,7 @@
     "postinstall": "./install-dependencies.sh"
   },
   "dependencies": {
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d99d371",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#0006ebd",
     "axios": "^1.6.8",
     "dotenv": "^16.3.1",
     "eslint": "^8.56.0",

diff --git a/e2e/tests/ui-driven/pnpm-lock.yaml b/e2e/tests/ui-driven/pnpm-lock.yaml
diff --git a/editor.planx.uk/package.json b/editor.planx.uk/package.json
@@ -13,7 +13,7 @@
     "@mui/material": "^5.15.2",
     "@mui/utils": "^5.15.2",
     "@opensystemslab/map": "^0.8.3",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d99d371",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#0006ebd",
     "@tiptap/core": "^2.4.0",
     "@tiptap/extension-bold": "^2.0.3",
     "@tiptap/extension-bubble-menu": "^2.1.13",

diff --git a/editor.planx.uk/pnpm-lock.yaml b/editor.planx.uk/pnpm-lock.yaml