Information page test rebase 6

.docker/Procfile

@@ -1,3 +1,2 @@
 web: python manage.py runserver 0.0.0.0:8000
-scheduler: python manage.py scheduler
 frontend: npm run start:reload

.docker/bashrc.sh

@@ -5,6 +5,7 @@ alias dj="django-admin"
 if [ -n "$DEVCONTAINER" ]
 then
     alias djrun="django-admin runserver 0.0.0.0:8000"
+    alias djtest="python manage.py test --settings=cms.settings.test"
     alias djrunplus="python manage.py runserver_plus 0.0.0.0:8000"
     alias honcho="honcho -f .docker/Procfile"
 fi

.editorconfig

@@ -32,7 +32,7 @@ trim_trailing_whitespace = true
 # Possible values - true, false
 insert_final_newline = true
 
-[*.{js,html,json,yaml,yml}]
+[*.{js,json,yaml,yml}]
 indent_size = 2
 
 [*.{json,yaml,yml}]

.gitignore

@@ -187,3 +187,6 @@ static/
 
 # mkdocs
 /site
+
+# Media files
+/media

.pylintrc

@@ -52,7 +52,7 @@ ignore=CVS
 # ignore-list. The regex matches against paths and can be in Posix or Windows
 # format. Because '\\' represents the directory delimiter on Windows systems,
 # it can't be used as an escape character.
-ignore-paths=.*/migrations,.venv,venv,.mypy_cache,node_modules
+ignore-paths=.*/migrations,.venv,venv,.mypy_cache,node_modules,cms/settings/formats
 
 # Files or directories matching the regular expression patterns are skipped.
 # The regex matches against base names, not paths. The default value ignores
@@ -434,12 +434,18 @@ disable=raw-checker-failed,
         duplicate-code,
         wrong-import-order,
         missing-module-docstring,
-        too-many-ancestors
+        too-many-ancestors,
+        too-few-public-methods,
+        missing-class-docstring,
+        fixme
 
 # note:
 # - wrong-import-order: covered by ruff
 # - missing-module-docstring: because they should be self-explanatory
 # - too-many-ancestors: because of our and Wagtail's use of mixins
+# - too-few-public-methods: because of Django Meta classes
+# - missing-class-docstring: mostly because of Django classes.
+# - fixme: because we want to leave TODO notes for future features.
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option

Makefile

@@ -11,7 +11,6 @@ all: ## Show the available make targets.
 
 .PHONY: clean
 clean: ## Clean the temporary files.
-	rm -rf .pytest_cache
 	rm -rf .mypy_cache
 	rm -rf .coverage
 	rm -rf .ruff_cache
@@ -39,6 +38,7 @@ lint: lint-py lint-html lint-frontend ## Run all linters (python, html, front-en
 .PHONY: lint-py
 lint-py:  ## Run all Python linters (ruff/pylint/mypy).
 	poetry run ruff check .
+	poetry run ruff format --check .
 	find . -type f -name "*.py" | xargs poetry run pylint --reports=n --output-format=colorized --rcfile=.pylintrc --django-settings-module=cms.settings.production -j 0
 	make mypy
 
@@ -52,7 +52,10 @@ lint-frontend:  ## Run front-end linters
 
 .PHONY: test
 test:  ## Run the tests and check coverage.
-	poetry run pytest -n auto --ds=cms.settings.test --cov=cms --cov-report term-missing
+	poetry run coverage erase
+	poetry run coverage run ./manage.py test --parallel --settings=cms.settings.test
+	poetry run coverage combine
+	poetry run coverage report --fail-under=90
 
 .PHONY: mypy
 mypy:  ## Run mypy.

README.md

@@ -51,7 +51,7 @@ Ensure you have the following installed:
    managing Python versions.
 2. **[Poetry](https://python-poetry.org/)**: This is used to manage package dependencies and virtual
    environments.
-3. **[Docker](https://docs.docker.com/engine/install/)** and **[Docker Compose](https://docs.docker.com/compose/)**.
+3. **[Colima](https://github.com/ONSdigital/dp-compose/blob/main/setting-up-colima-locally.md)** for running the project in Docker containers.
 4. **[PostgreSQL](https://www.postgresql.org/)** for the database. Provided as container via `docker-compose.yml` when using the Docker setup.
 5. **[Node](https://nodejs.org/en)** and **[`nvm` (Node Version Manager)](https://github.com/nvm-sh/nvm)** for front-end tooling.
 6. **Operation System**: Ubuntu/MacOS
@@ -168,13 +168,14 @@ poetry add wagtailmedia
 
 ### Run Tests with Coverage
 
-The unit tests are written using the [pytest](https://docs.pytest.org/en/stable/) framework. To run the tests and check
-coverage, run:
+To run the tests and check coverage, run:
 
 ```bash
 make test
 ```
 
+During tests, the `cms.settings.test` settings module is used. When running test without using `make test`, ensure this settings module is used.
+
 ### Linting and Formatting
 
 Various tools are used to lint and format the code in this project.
@@ -260,11 +261,11 @@ make megalint
 Wagtail is built on [Django](https://djangoproject.com/) and changes to its models may require generating and
 running schema migrations. For full details see the [Django documentation on migrations](https://docs.djangoproject.com/en/5.1/topics/migrations/)
 
-Below are the commands you will most commonly use:
+Below are the commands you will most commonly use, note that these have to be run inside the container.
 
 ```bash
 # Check if you need to generate any new migrations after changes to the model
-poetru run django-admin makemigrations --check
+poetry run django-admin makemigrations --check
 
 # Generate migrations
 poetry run django-admin makemigrations

cms/analysis/blocks.py

@@ -0,0 +1,59 @@
+from typing import TYPE_CHECKING, ClassVar
+
+from django.utils.text import slugify
+from wagtail.blocks import RichTextBlock, StreamBlock, StructBlock
+from wagtail.embeds.blocks import EmbedBlock
+from wagtail.images.blocks import ImageChooserBlock
+from wagtailmath.blocks import MathBlock
+
+from cms.core.blocks import (
+    DocumentsBlock,
+    HeadingBlock,
+    ONSEmbedBlock,
+    PanelBlock,
+    RelatedContentBlock,
+    RelatedLinksBlock,
+)
+
+if TYPE_CHECKING:
+    from wagtail.blocks import StructValue
+
+
+class SectionContentBlock(StreamBlock):
+    """The analysis section content StreamField block definition."""
+
+    rich_text = RichTextBlock()
+    panel = PanelBlock()
+    image = ImageChooserBlock(group="Media")
+    documents = DocumentsBlock(group="Media")
+    embed = EmbedBlock(group="Media")
+    equation = MathBlock(group="DataVis", icon="decimal")
+    ons_embed = ONSEmbedBlock(group="DataVis", label="ONS General Embed")
+    related_links = RelatedLinksBlock(RelatedContentBlock(), icon="link")
+
+    class Meta:
+        template = "templates/components/streamfield/stream_block.html"
+        block_counts: ClassVar[dict[str, dict]] = {"related_links": {"max_num": 1}}
+
+
+class SectionBlock(StructBlock):
+    """The analysis section block definition."""
+
+    title = HeadingBlock()
+    content = SectionContentBlock()
+
+    def to_table_of_contents_items(self, value: "StructValue") -> list[dict[str, str]]:
+        """Convert the value to the table of contents component macro format."""
+        return [{"url": "#" + slugify(value["title"]), "text": value["title"]}]
+
+    class Meta:
+        template = "templates/components/streamfield/analysis_section_block.html"
+
+
+class AnalysisStoryBlock(StreamBlock):
+    """The analysis StreamField block definition."""
+
+    section = SectionBlock()
+
+    class Meta:
+        template = "templates/components/streamfield/stream_block.html"

cms/analysis/migrations/0001_initial.py

@@ -0,0 +1,104 @@
+# Generated by Django 5.1.2 on 2024-11-04 17:20
+
+import django.db.models.deletion
+import wagtail.contrib.routable_page.models
+import wagtail.fields
+from django.db import migrations, models
+
+import cms.core.fields
+
+
+class Migration(migrations.Migration):
+    initial = True
+
+    dependencies = [
+        ("core", "0002_contactdetails"),
+        ("images", "0002_customimage_description"),
+        ("wagtailcore", "0094_alter_page_locale"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="AnalysisSeries",
+            fields=[
+                (
+                    "page_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="wagtailcore.page",
+                    ),
+                ),
+            ],
+            options={
+                "abstract": False,
+            },
+            bases=(wagtail.contrib.routable_page.models.RoutablePageMixin, "wagtailcore.page"),
+        ),
+        migrations.CreateModel(
+            name="AnalysisPage",
+            fields=[
+                (
+                    "page_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="wagtailcore.page",
+                    ),
+                ),
+                ("listing_title", models.CharField(blank=True, max_length=255)),
+                ("listing_summary", models.CharField(blank=True, max_length=255)),
+                ("social_text", models.CharField(blank=True, max_length=255)),
+                ("news_headline", models.CharField(blank=True, max_length=255)),
+                ("summary", wagtail.fields.RichTextField()),
+                ("main_points_summary", wagtail.fields.RichTextField()),
+                ("release_date", models.DateField()),
+                ("next_release_date", models.DateField(blank=True, null=True)),
+                ("is_accredited", models.BooleanField(default=False)),
+                ("is_census", models.BooleanField(default=False)),
+                ("headline_figures", cms.core.fields.StreamField(blank=True, block_lookup={})),
+                ("content", cms.core.fields.StreamField(block_lookup={})),
+                ("show_cite_this_page", models.BooleanField(default=True)),
+                (
+                    "contact_details",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="+",
+                        to="core.contactdetails",
+                    ),
+                ),
+                (
+                    "listing_image",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="+",
+                        to="images.customimage",
+                    ),
+                ),
+                (
+                    "social_image",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="+",
+                        to="images.customimage",
+                    ),
+                ),
+            ],
+            options={
+                "abstract": False,
+            },
+            bases=("wagtailcore.page", models.Model),
+        ),
+    ]