ccs-digitalmarketplace-frameworks 4.0.13 → 4.1.0

package/frameworks/digital-outcomes-and-specialists-7/manifests/edit_additional_lot_questions.yml

@@ -1,17 +1,20 @@
 -
   name: Award question - Capability and capacity
+  slug: capability-capacity
   editable: True
   questions:
     - multiqDemonstrateCapabilityAndCapacity
 
 -
   name: Award question - Quality and innovation
+  slug: quality-innovation
   editable: True
   questions:
     - multiqDemonstrateQualityAndInnovation
 
 -
   name: Award question - Continuous improvement and knowledge transfer
+  slug: continuous-improvement-and-knowledge-transfer
   editable: True
   questions:
     - multiqContinuousImprovementAndKnowledgeTransfer

package/frameworks/digital-outcomes-and-specialists-7/questions/declaration/groupOrConsortiumJointVentureStatement.yml

@@ -6,18 +6,18 @@ type: radios
 
 options:
   - label: You have set up a joint venture company or special purpose vehicle (SPV) and are submitting a tender in the name of the joint venture via the SPV Digital Marketplace account
-    value: joint-ventrue
+    value: joint-venture
   - label: You have not set up a joint venture company or special purpose vehicle (SPV) prior to submitting a tender, but if your tender is successful, you will form a specific legal entity, a joint  venture company or special purpose vehicle (SPV) before signing the Framework Contract
     value: joint-venture-if-successful
   - label: You have not set up a joint venture company or special purpose vehicle (SPV) prior to submitting a tender, and will not if your tender is successful
-    value: no-joint-ventrue
+    value: no-joint-venture
 
 followup:
   multiqStatementDetail:
     - joint-venture-if-successful
-    - no-joint-ventrue
+    - no-joint-venture
   tenderInfoMultiqConnectedPersons:
-    - joint-ventrue
+    - joint-venture
 
 validations:
   -

package/frameworks/digital-outcomes-and-specialists-7/questions/declaration/mandatoryAwardQuestion.yml

@@ -1,4 +1,4 @@
-name: Name of consortium
+name: Deliver all mandatory service requirements
 question: If you are awarded a framework contract, will you deliver in full all mandatory service requirements in Framework Schedule 1 (Specification) for each Lot you have successfully tendered for?
 question_advice: >
   <p class="govuk-body">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccs-digitalmarketplace-frameworks",
-  "version": "4.0.13",
+  "version": "4.1.0",
   "description": "Data files for Digital Marketplace’s procurement frameworks",
   "repository": "git@github.com:Crown-Commercial-Service/ccs-digitalmarketplace-frameworks",
   "author": "enquiries@digitalmarketplace.service.gov.uk"

package/requirements-dev.txt

@@ -30,7 +30,7 @@ ccs-digitalmarketplace-apiclient==28.0.0
     # via
     #   -r requirements.txt
     #   ccs-digitalmarketplace-utils
-ccs-digitalmarketplace-content-loader==13.5.0
+ccs-digitalmarketplace-content-loader==13.6.0
     # via -r requirements.txt
 ccs-digitalmarketplace-utils==69.0.0
     # via
@@ -114,7 +114,7 @@ govuk-country-register==0.5.0
     # via
     #   -r requirements.txt
     #   ccs-digitalmarketplace-utils
-hypothesis==6.130.5
+hypothesis==6.130.9
     # via -r requirements-dev.in
 identify==2.6.8
     # via pre-commit

package/requirements.in

@@ -1,5 +1,5 @@
 docopt==0.6.2
 deepmerge==2.0
 python-json-logger==2.0.7
-ccs-digitalmarketplace-content-loader==13.5.0
+ccs-digitalmarketplace-content-loader==13.6.0
 ccs-digitalmarketplace-utils==69.0.0

package/requirements.txt

@@ -16,7 +16,7 @@ cachelib==0.13.0
     # via flask-session
 ccs-digitalmarketplace-apiclient==28.0.0
     # via ccs-digitalmarketplace-utils
-ccs-digitalmarketplace-content-loader==13.5.0
+ccs-digitalmarketplace-content-loader==13.6.0
     # via -r requirements.in
 ccs-digitalmarketplace-utils==69.0.0
     # via

package/tests/test_manifest.py

@@ -0,0 +1,75 @@
+import glob
+
+import pytest
+
+from dmcontent import ContentLoader
+from dmcontent.errors import ContentNotFoundError
+
+content = ContentLoader('./')
+
+
+EXCLUDED_FRAMEWORKS = [
+    'digital-outcomes-and-specialists',
+    'digital-outcomes-and-specialists-2',
+    'digital-outcomes-and-specialists-3',
+    'digital-outcomes-and-specialists-4',
+    'digital-outcomes-and-specialists-5',
+    'g-cloud-6',
+    'g-cloud-7',
+    'g-cloud-8',
+    'g-cloud-9',
+    'g-cloud-10',
+    'g-cloud-11',
+    'g-cloud-12',
+]
+
+
+def get_evaluation_manifests():
+    paths = glob.glob('frameworks/*')
+    for path in paths:
+        _, framework = path.split('/')
+        if framework in EXCLUDED_FRAMEWORKS:
+            continue
+
+        try:
+            content.load_manifest(
+                framework,
+                'additional-lot-questions',
+                'edit_additional_lot_questions'
+            )
+            content.load_manifest(
+                framework,
+                'additional-lot-questions',
+                'evaluations'
+            )
+        except ContentNotFoundError:
+            continue
+
+    for framework, framework_manifests in content._content.items():
+        if (
+            'edit_additional_lot_questions' not in framework_manifests
+            or 'evaluations' not in framework_manifests
+        ):
+            continue
+
+        yield (
+            framework,
+            framework_manifests['edit_additional_lot_questions'],
+            framework_manifests['evaluations']
+        )
+
+
+@pytest.mark.parametrize(
+    ('framework', 'additional_lot_questions_manifest', 'evaluations_manifest'),
+    get_evaluation_manifests()
+)
+def test_sections_have_the_same_slugs_for_evaluation(
+    framework,
+    additional_lot_questions_manifest,
+    evaluations_manifest
+):
+    assert [
+        section['slug'] for section in additional_lot_questions_manifest
+    ] == [
+        section['slug'] for section in evaluations_manifest
+    ], f"Evaluation sections do not slign for {framework}"