-
+
+ {% if organisation.dataset %}
+ {{ organisation.dataset | datasetSlugToReadableName(true) }}
+ {% endif %}
+
{{ pageName }}
+
+
-
- {{ pageName }}
-
+
+
{% for dataset in datasets.statutory %}
{% if dataset.notice %}
@@ -171,6 +176,37 @@
Datasets {{ organisation.name}} can provide
{% endif %}
+
+
+ {% if planningGroupMembers %}
+
+ {% endif %}
+ {% if parentGroup %}
+
+ {% endif %}
+
{% endblock %}
diff --git a/test/integration/authoritative_data.playwright.test.js b/test/integration/authoritative_data.playwright.test.js
index 273d2810a..4220c4743 100644
--- a/test/integration/authoritative_data.playwright.test.js
+++ b/test/integration/authoritative_data.playwright.test.js
@@ -1,9 +1,12 @@
import { test, expect } from '@playwright/test'
const resetWiremock = async () => {
- await fetch('http://localhost:8001/__admin/mappings/reset', {
+ const response = await fetch('http://localhost:8001/__admin/mappings/reset', {
method: 'POST'
})
+ if (!response.ok) {
+ throw new Error(`Failed to reset WireMock mappings: ${response.status} ${await response.text()}`)
+ }
}
test.beforeEach(async () => {
diff --git a/test/integration/global-setup.js b/test/integration/global-setup.js
index 8e8d11cc0..d1224f34c 100644
--- a/test/integration/global-setup.js
+++ b/test/integration/global-setup.js
@@ -12,6 +12,10 @@ setup('Global setup', async () => {
await new Wiremock().start()
- localstack = await new Localstack().start()
- await localstack.createBucket(config.aws.bucket)
+ // In CI, LocalStack is provided by docker-compose with bucket already created via bootstrap script.
+ // Only start the testcontainer locally where docker-compose is not running.
+ if (!process.env.CI) {
+ localstack = await new Localstack().start()
+ await localstack.createBucket(config.aws.bucket)
+ }
})
diff --git a/test/integration/global-teardown.js b/test/integration/global-teardown.js
index 19cc8040e..de5a7b6af 100644
--- a/test/integration/global-teardown.js
+++ b/test/integration/global-teardown.js
@@ -10,5 +10,8 @@ teardown('Global teardown', async () => {
await new Wiremock().stop()
- await new Localstack().stop()
+ // Only stop the testcontainer locally — in CI it was never started (docker-compose handles LocalStack).
+ if (!process.env.CI) {
+ await new Localstack().stop()
+ }
})
diff --git a/test/integration/planning_group.playwright.test.js b/test/integration/planning_group.playwright.test.js
new file mode 100644
index 000000000..fcbdc4a09
--- /dev/null
+++ b/test/integration/planning_group.playwright.test.js
@@ -0,0 +1,66 @@
+import { test, expect } from '@playwright/test'
+
+const resetWiremock = async () => {
+ const response = await fetch('http://localhost:8001/__admin/mappings/reset', {
+ method: 'POST'
+ })
+ if (!response.ok) {
+ throw new Error(`Failed to reset WireMock mappings: ${response.status} ${await response.text()}`)
+ }
+}
+
+const addWiremockStub = async (stub) => {
+ const response = await fetch('http://localhost:8001/__admin/mappings', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify(stub)
+ })
+ if (!response.ok) {
+ throw new Error(`Failed to add WireMock stub: ${response.status} ${await response.text()}`)
+ }
+}
+
+test.describe('Planning group', () => {
+ test.describe.configure({ mode: 'serial' })
+
+ test.beforeEach(async () => {
+ await resetWiremock()
+ })
+
+ test('An LPA that is a member of a planning group shows the group membership banner on the overview page', async ({ page }) => {
+ // Stub the local-planning-group entity endpoint to return a group containing local-authority:SLF
+ await addWiremockStub({
+ priority: 1,
+ request: {
+ method: 'GET',
+ urlPattern: '/entity.json.*prefix=local-planning-group.*'
+ },
+ response: {
+ status: 200,
+ jsonBody: {
+ entities: [
+ {
+ entity: 9000001,
+ name: 'South London Joint Planning Group',
+ prefix: 'local-planning-group',
+ reference: 'south-london-joint',
+ 'organisation-entity': 9000001,
+ organisations: 'local-authority:SLF;local-authority:LBH',
+ 'end-date': ''
+ }
+ ],
+ count: 1
+ }
+ }
+ })
+
+ // Navigate to the LPA overview for SLF
+ await page.goto('/organisations/local-authority:SLF')
+
+ // The Group Membership banner should be visible
+ await expect(page.getByText('Group Membership')).toBeVisible()
+
+ // The planning group name should appear as a link
+ await expect(page.getByRole('link', { name: 'South London Joint Planning Group' })).toBeVisible()
+ })
+})
diff --git a/test/testContainers/localstack.js b/test/testContainers/localstack.js
index 36290f3c3..d6bcee579 100644
--- a/test/testContainers/localstack.js
+++ b/test/testContainers/localstack.js
@@ -3,7 +3,7 @@ import { S3Client, CreateBucketCommand } from '@aws-sdk/client-s3'
export default class Localstack {
constructor () {
- this.image = 'localstack/localstack:latest'
+ this.image = 'localstack/localstack:3.1'
this.buckets = []
}
@@ -16,7 +16,6 @@ export default class Localstack {
async stop () {
console.log('Stopping LocalstackContainer')
this.container = await new LocalstackContainer(this.image).withReuse(true).start()
- this.container.stop()
await this.container.stop()
}
diff --git a/test/testContainers/wiremock.js b/test/testContainers/wiremock.js
index 99b74163b..bf905b035 100644
--- a/test/testContainers/wiremock.js
+++ b/test/testContainers/wiremock.js
@@ -43,6 +43,6 @@ export default class Wiremock {
host: config.asyncRequestApi.port
})
.withReuse(true).start()
- this.container.stop()
+ await this.container.stop()
}
}
diff --git a/test/unit/findPage.test.js b/test/unit/findPage.test.js
index 29cb15ecb..9d47dc582 100644
--- a/test/unit/findPage.test.js
+++ b/test/unit/findPage.test.js
@@ -40,13 +40,12 @@ describe(`Organisations Find Page (seed: ${seed})`, () => {
it('Renders the correct organisation list with appropriate attributes', () => {
const organisationList = document.querySelector('#search_results')
- expect(organisationList.children.length).toBe(Object.keys(params.alphabetisedOrgs).length)
+ expect(organisationList.children.length).toBe(Object.keys(params.orgsByDataset).length)
- Object.keys(params.alphabetisedOrgs).forEach((letter, i) => {
+ Object.keys(params.orgsByDataset).forEach((datasetType, i) => {
const organisationSection = organisationList.children[i]
- expect(organisationSection.querySelector('.blockHeading').textContent).toBe(letter)
- const organisationListItems = organisationSection.querySelector('.govuk-list').children
- params.alphabetisedOrgs[letter].forEach((organisation, j) => {
+ const organisationListItems = organisationSection.querySelectorAll('[data-filter="item"]')
+ params.orgsByDataset[datasetType].forEach((organisation, j) => {
expect(organisationListItems[j].textContent).toContain(organisation.name)
expect(organisationListItems[j].getAttribute('data-filter')).toEqual('item')
expect(organisationListItems[j].getAttribute('data-filter-terms')).toEqual(organisation.name)
diff --git a/test/unit/middleware/common.middleware.test.js b/test/unit/middleware/common.middleware.test.js
index 7ead80739..0f93afeca 100644
--- a/test/unit/middleware/common.middleware.test.js
+++ b/test/unit/middleware/common.middleware.test.js
@@ -10,7 +10,8 @@ vi.mock('../../../src/services/performanceDbApi.js')
vi.mock('../../../src/services/platformApi.js', () => ({
default: {
- fetchEntities: vi.fn()
+ fetchEntities: vi.fn(),
+ fetchAllEntities: vi.fn()
}
}))
@@ -1580,20 +1581,20 @@ describe('preventIndexing middleware', () => {
})
it('sets req.authority to "some" when no authoritative but some quality entities exist', async () => {
- platformApi.fetchEntities
- .mockResolvedValueOnce({ formattedData: [] }) // authoritative query returns empty
- .mockResolvedValueOnce({ formattedData: [{ entity: '2', name: 'Some Quality Entity' }] }) // some query returns data
+ platformApi.fetchEntities.mockResolvedValueOnce({ formattedData: [] }) // authoritative query returns empty
+ platformApi.fetchAllEntities.mockResolvedValueOnce({ formattedData: [{ entity: '2', name: 'Some Quality Entity' }] }) // some query returns data
await prepareAuthority(req, res, next)
- expect(platformApi.fetchEntities).toHaveBeenCalledTimes(2)
- expect(platformApi.fetchEntities).toHaveBeenNthCalledWith(1, {
+ expect(platformApi.fetchEntities).toHaveBeenCalledTimes(1)
+ expect(platformApi.fetchEntities).toHaveBeenCalledWith({
organisation_entity: '12345',
dataset: 'local-plan-boundary',
quality: 'authoritative',
limit: 1
})
- expect(platformApi.fetchEntities).toHaveBeenNthCalledWith(2, {
+ expect(platformApi.fetchAllEntities).toHaveBeenCalledTimes(1)
+ expect(platformApi.fetchAllEntities).toHaveBeenCalledWith({
organisation_entity: '12345',
dataset: 'local-plan-boundary',
quality: 'some'
@@ -1603,13 +1604,13 @@ describe('preventIndexing middleware', () => {
})
it('sets req.authority to empty string when neither authoritative nor some quality entities exist', async () => {
- platformApi.fetchEntities
- .mockResolvedValueOnce({ formattedData: [] }) // authoritative query returns empty
- .mockResolvedValueOnce({ formattedData: [] }) // some query returns empty
+ platformApi.fetchEntities.mockResolvedValueOnce({ formattedData: [] }) // authoritative query returns empty
+ platformApi.fetchAllEntities.mockResolvedValueOnce({ formattedData: [] }) // some query returns empty
await prepareAuthority(req, res, next)
- expect(platformApi.fetchEntities).toHaveBeenCalledTimes(2)
+ expect(platformApi.fetchEntities).toHaveBeenCalledTimes(1)
+ expect(platformApi.fetchAllEntities).toHaveBeenCalledTimes(1)
expect(req.authority).toBe('')
expect(next).toHaveBeenCalledTimes(1)
})
@@ -1626,9 +1627,8 @@ describe('preventIndexing middleware', () => {
})
it('handles null formattedData gracefully', async () => {
- platformApi.fetchEntities
- .mockResolvedValueOnce({ formattedData: null }) // authoritative query returns null
- .mockResolvedValueOnce({ formattedData: null }) // some query returns null
+ platformApi.fetchEntities.mockResolvedValueOnce({ formattedData: null }) // authoritative query returns null
+ platformApi.fetchAllEntities.mockResolvedValueOnce({ formattedData: null }) // some query returns null
await prepareAuthority(req, res, next)
@@ -1637,9 +1637,8 @@ describe('preventIndexing middleware', () => {
})
it('handles undefined formattedData gracefully', async () => {
- platformApi.fetchEntities
- .mockResolvedValueOnce({}) // authoritative query returns no formattedData
- .mockResolvedValueOnce({}) // some query returns no formattedData
+ platformApi.fetchEntities.mockResolvedValueOnce({}) // authoritative query returns no formattedData
+ platformApi.fetchAllEntities.mockResolvedValueOnce({}) // some query returns no formattedData
await prepareAuthority(req, res, next)
diff --git a/test/unit/middleware/organisations.middleware.test.js b/test/unit/middleware/organisations.middleware.test.js
index 9650e533a..4ce7ecf28 100644
--- a/test/unit/middleware/organisations.middleware.test.js
+++ b/test/unit/middleware/organisations.middleware.test.js
@@ -21,21 +21,13 @@ describe('organisations.middleware.js', () => {
prepareGetOrganisationsTemplateParams(req, res, next)
const expectedTemplatePrams = {
- alphabetisedOrgs: {
- A: [
- { name: 'Aardvark Healthcare', organisation: 'Aardvark Healthcare' }
- ],
- B: [
+ orgsByDataset: {
+ other: [
+ { name: 'Aardvark Healthcare', organisation: 'Aardvark Healthcare' },
{ name: 'Bath NHS Trust', organisation: 'Bath NHS Trust' },
- { name: 'Bristol Hospital', organisation: 'Bristol Hospital' }
- ],
- C: [
- { name: 'Cardiff Health Board', organisation: 'Cardiff Health Board' }
- ],
- D: [
- { name: 'Derbyshire Healthcare', organisation: 'Derbyshire Healthcare' }
- ],
- E: [
+ { name: 'Bristol Hospital', organisation: 'Bristol Hospital' },
+ { name: 'Cardiff Health Board', organisation: 'Cardiff Health Board' },
+ { name: 'Derbyshire Healthcare', organisation: 'Derbyshire Healthcare' },
{ name: 'East Sussex NHS Trust', organisation: 'East Sussex NHS Trust' }
]
}
@@ -52,22 +44,10 @@ describe('organisations.middleware.js', () => {
const next = vi.fn()
req.templateParams = {
- alphabetisedOrgs: {
- A: [
- { name: 'Aardvark Healthcare', organisation: 'Aardvark Healthcare' }
- ],
- B: [
- { name: 'Bath NHS Trust', organisation: 'Bath NHS Trust' },
- { name: 'Bristol Hospital', organisation: 'Bristol Hospital' }
- ],
- C: [
- { name: 'Cardiff Health Board', organisation: 'Cardiff Health Board' }
- ],
- D: [
- { name: 'Derbyshire Healthcare', organisation: 'Derbyshire Healthcare' }
- ],
- E: [
- { name: 'East Sussex NHS Trust', organisation: 'East Sussex NHS Trust' }
+ orgsByDataset: {
+ other: [
+ { name: 'Aardvark Healthcare', organisation: 'Aardvark Healthcare' },
+ { name: 'Bath NHS Trust', organisation: 'Bath NHS Trust' }
]
}
}
diff --git a/test/unit/views/organisations/get-startedPage.test.js b/test/unit/views/organisations/get-startedPage.test.js
index 47d403217..441b6a7ac 100644
--- a/test/unit/views/organisations/get-startedPage.test.js
+++ b/test/unit/views/organisations/get-startedPage.test.js
@@ -26,7 +26,7 @@ describe(`Get Started Page (seed: ${seed})`, () => {
expect(document.querySelector('span.govuk-caption-xl').textContent).toEqual(params.organisation.name)
// Filter returns slug in tests (no mapping loaded), check slug passes through
expect(document.querySelector('h1').textContent).toContain(params.dataset.dataset)
- expect(document.querySelector('#main-content h2').textContent).toContain(`How to prepare and provide your ${params.dataset.dataset} data`)
+ expect(document.querySelector('#main-content h2.govuk-heading-l').textContent).toContain(`How to prepare and provide your ${params.dataset.dataset} data`)
})
it('Renders breadcrumbs correctly', () => {