From a1e02d1fec2bb4707d584502db2a5cf7e7c81dae Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 8 Jan 2019 11:54:14 +0000 Subject: [PATCH 1/5] Mark agreement signed by North Lincs, Walsall and East Dunbartonshire --- app/domains.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/domains.yml b/app/domains.yml index 4ea73dc69..ded93a3bc 100644 --- a/app/domains.yml +++ b/app/domains.yml @@ -1639,7 +1639,7 @@ eastdorset.gov.uk: eastdunbarton.gov.uk: owner: East Dunbartonshire Council crown: false - agreement_signed: false + agreement_signed: true eastgrinstead.gov.uk: owner: East Grinstead Town Council crown: false @@ -3235,7 +3235,7 @@ northleach.gov.uk: northlincs.gov.uk: owner: North Lincolnshire Council crown: false - agreement_signed: false + agreement_signed: true north-norfolk.gov.uk: owner: North Norfolk District Council crown: false @@ -4743,7 +4743,7 @@ wallingfordtowncouncil.gov.uk: walsall.gov.uk: owner: Walsall Metropolitan Borough Council crown: false - agreement_signed: false + agreement_signed: true walthamabbey-tc.gov.uk: owner: Waltham Abbey Town Council crown: false From 61b902554fa95b24aa5c36475cb3d8120dc3bfb5 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 8 Jan 2019 13:03:06 +0000 Subject: [PATCH 2/5] =?UTF-8?q?=E2=80=A6and=20Aberdeenshire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/domains.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/domains.yml b/app/domains.yml index ded93a3bc..7a632b558 100644 --- a/app/domains.yml +++ b/app/domains.yml @@ -295,7 +295,7 @@ aberdeencity.gov.uk: aberdeenshire.gov.uk: owner: Aberdeenshire Council crown: false - agreement_signed: false + agreement_signed: true AbergavennyTownCouncil.gov.uk: owner: Abergavenny Town Council crown: false @@ -1982,10 +1982,7 @@ goytre.gov.uk: owner: Goetre Fawr Community Council crown: false agreement_signed: false -grampiancaredata.gov.uk: - owner: Aberdeenshire Council - crown: false - agreement_signed: false +grampiancaredata.gov.uk: aberdeenshire.gov.uk grangeoversandstowncouncil.gov.uk: owner: Grange Over Sands Town Council crown: false From 59f260c785c5ed96b33826dab259ab7cf18abcf1 Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Tue, 8 Jan 2019 13:59:40 +0000 Subject: [PATCH 3/5] And South Ayrshire... --- app/domains.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/domains.yml b/app/domains.yml index 7a632b558..2035d248a 100644 --- a/app/domains.yml +++ b/app/domains.yml @@ -4055,7 +4055,7 @@ southandvale.gov.uk: south-ayrshire.gov.uk: owner: South Ayrshire Council crown: false - agreement_signed: false + agreement_signed: true southbucks.gov.uk: owner: South Buckinghamshire District Council crown: false From 2ef4d1c401984ed758abce82728abbb11d566fee Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 8 Jan 2019 15:12:44 +0000 Subject: [PATCH 4/5] Resolve aliases for Ayrshire --- app/domains.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/app/domains.yml b/app/domains.yml index 2035d248a..8488cdd5d 100644 --- a/app/domains.yml +++ b/app/domains.yml @@ -489,14 +489,8 @@ aylsham-tc.gov.uk: owner: Aylsham Town Council crown: false agreement_signed: false -ayrshire.gov.uk: - owner: South Ayrshire Council - crown: false - agreement_signed: false -ayrshire-jsu.gov.uk: - owner: South Ayrshire Council - crown: false - agreement_signed: false +ayrshire.gov.uk: south-ayrshire.gov.uk +ayrshire-jsu.gov.uk: south-ayrshire.gov.uk babergh.gov.uk: owner: Babergh District Council crown: false @@ -3096,7 +3090,7 @@ newforest.gov.uk: newham.gov.uk: owner: Newham London Borough Council crown: false - agreement_signed: true + agreement_signed: true newhaventowncouncil.gov.uk: owner: Newhaven Town Council crown: false From a093b8d976fbea087d0c4fc7da35794befb204bd Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 8 Jan 2019 15:12:52 +0000 Subject: [PATCH 5/5] Use Babergh as the example in tests Because Aberdeenshire have signed the agreement. --- tests/app/test_utils.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/app/test_utils.py b/tests/app/test_utils.py index 5f75176f7..d65cafbb5 100644 --- a/tests/app/test_utils.py +++ b/tests/app/test_utils.py @@ -351,12 +351,14 @@ def test_get_valid_agreement_info_some_known_details(): def test_get_valid_local_agreement_info_some_known_details(): - agreement_info = AgreementInfo("aberdeenshire.gov.uk") + # This example may need to be updated to use a different council if + # Babergh every sign the agreement + agreement_info = AgreementInfo("babergh.gov.uk") assert agreement_info.crown_status is False - assert agreement_info.owner == "Aberdeenshire Council" + assert agreement_info.owner == "Babergh District Council" assert agreement_info.agreement_signed is False assert agreement_info.as_human_readable == ( - 'No (organisation is Aberdeenshire Council, a non-crown body)' + 'No (organisation is Babergh District Council, a non-crown body)' )