Skip to content

Commit fb31916

Browse files
committed
Merge branch 'feature/CCM-7465_backend-api' of https://github.com/NHSDigital/nhs-notify-web-template-management into feature/CCM-7465_remove-amplify
2 parents 7e285c3 + f81c1dd commit fb31916

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

.github/workflows/stage-4-acceptance.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ permissions:
4242
jobs:
4343
sandbox-set-up:
4444
name: "Sandbox set up"
45-
runs-on: ubuntu-latest
45+
runs-on: ubuntu-22.04
4646
environment: dev
4747
timeout-minutes: 15
4848
steps:
@@ -66,7 +66,7 @@ jobs:
6666
path: sandbox_tf_outputs.json
6767
test-security:
6868
name: "Security test"
69-
runs-on: ubuntu-latest
69+
runs-on: ubuntu-22.04
7070
needs: [sandbox-set-up]
7171
timeout-minutes: 10
7272
steps:
@@ -80,7 +80,7 @@ jobs:
8080
echo "Nothing to save"
8181
test-accessibility:
8282
name: "Accessibility test"
83-
runs-on: ubuntu-latest
83+
runs-on: ubuntu-22.04
8484
needs: [sandbox-set-up]
8585
environment: dev
8686
env:
@@ -116,7 +116,7 @@ jobs:
116116
path: ".reports/accessibility"
117117
test-ui-component:
118118
name: "UI Component test"
119-
runs-on: ubuntu-latest
119+
runs-on: ubuntu-22.04
120120
needs: [sandbox-set-up]
121121
environment: dev
122122
env:
@@ -157,7 +157,7 @@ jobs:
157157
sandbox-tear-down:
158158
name: "Sandbox tear down"
159159
if: success() || failure()
160-
runs-on: ubuntu-latest
160+
runs-on: ubuntu-22.04
161161
needs: [test-accessibility, test-ui-component]
162162
environment: dev
163163
steps:

frontend/src/app/manage-templates/page.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ import content from '@content/content';
33
import { ManageTemplates } from '@molecules/ManageTemplates/ManageTemplates';
44
import { getTemplates } from '@utils/form-actions';
55

6-
// Note: this page is forced to be server-side rendered
6+
// Note: force this page to be dynamically rendered
77
// This is because Next defaults this page as a static rendered page
8-
// which causes a build failure due to getTemplates attempting to get cookies
8+
// which causes a build failure due to getTemplates attempting to get a server-side session via cookies and failing
9+
// The other pages which do similar thing expect a templateId parameter
10+
// Which informs next it needs to be dynamically rendered
911
export const dynamic = 'force-dynamic';
1012

1113
const manageTemplatesContent = content.pages.manageTemplates;

tests/test-team/config/local.config.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ import baseConfig from './playwright.config';
44
export default defineConfig({
55
...baseConfig,
66

7-
timeout: 15_000,
8-
7+
timeout: 30_000, // 30 seconds in the playwright default
8+
expect: {
9+
timeout: 10_000, // default is 5 seconds. After creating and previewing sometimes the load is slow on a cold start
10+
},
911
projects: [
1012
{
1113
name: 'auth-setup',

0 commit comments

Comments
 (0)