Add testing and remove unused code

.circleci/config.yml

@@ -13,8 +13,8 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - v7-dependencies-{{ checksum "Pipfile.lock" }}-{{ checksum "thumbs/Pipfile.lock" }}
-            - v7-dependencies-default
+            - v8-dependencies-{{ checksum "Pipfile.lock" }}-{{ checksum "thumbs/Pipfile.lock" }}
+            - v8-dependencies-default
       # Ensure pip and pipenv are installed
       - run:
           name: Install pipenv
@@ -24,43 +24,42 @@ jobs:
           name: Set up virtual environment
           command: |
             pipenv sync --dev
+      - run: pipenv run playwright install --with-deps chromium
       - run: make lambda-layers/DependenciesLayer/requirements.txt
-      - run: pipenv run collectstatic
       - run: npm install
       - run: npm run build
-      - run: DJANGO_SETTINGS_MODULE=electionleaflets.settings.base_lambda pipenv run collectstatic
+      - run: pipenv run collectstatic --settings electionleaflets.settings.testing
       - persist_to_workspace:
           root: ~/repo/
           paths:
-            - .aws-sam/build/
-            - thumbs/.aws-sam/build/
             - lambda-layers/DependenciesLayer/requirements.txt
             - electionleaflets/static/
+            - electionleaflets/assets/
       - save_cache:
           when: on_success
           paths:
             - ~/.local/share/virtualenvs/
-          key: v7-dependencies-{{ checksum "Pipfile.lock" }}-{{ checksum "thumbs/Pipfile.lock" }}
+          key: v8-dependencies-{{ checksum "Pipfile.lock" }}-{{ checksum "thumbs/Pipfile.lock" }}
   run-tests:
     docker:
-      - image: cimg/python:3.12
+      - image: cimg/python:3.12-browsers
         environment:
           CIRCLECI: true
           PGHOST: 127.0.0.1
       - image: cimg/postgres:16.3
         environment:
-          POSTGRES_USER: electionleaflets
+          POSTGRES_USER: circleci
           POSTGRES_DB: electionleaflets
     working_directory: ~/repo
 
     steps:
       - checkout
-
+      - attach_workspace:
+            at: ~/repo/
       # Download and cache dependencies
       - restore_cache:
           keys:
-            - v7-dependencies-{{ checksum "Pipfile.lock" }}
-
+            - v8-dependencies-{{ checksum "Pipfile.lock" }}
       - run: pipenv run pipenv verify
 
       - run: pipenv run python manage.py check
@@ -69,10 +68,11 @@ jobs:
       #- run: pipenv run python manage.py makemigrations --check
 
       # Run tests
+      - run: pipenv run playwright install --with-deps chromium
       - run:
           name: Run tests
           command: |
-            pipenv run test
+            pipenv run pytest
       - store_artifacts:
           path: test-results
           destination: test-results
@@ -125,8 +125,8 @@ jobs:
           at: ~/repo/
       - restore_cache:
           keys:
-            - v7-dependencies-{{ checksum "Pipfile.lock" }}
-            - v7-dependencies-default
+            - v8-dependencies-{{ checksum "Pipfile.lock" }}
+            - v8-dependencies-default
       - run:
           name: Install pipenv
           command: |

Pipfile

@@ -23,7 +23,6 @@ enum34 = "==1.1.6"
 fixtures = "==3.0.0"
 flake8 = "==3.8.3"
 funcsigs = "==1.0.2"
-futures = "==3.1.1"
 dj-pagination = "==2.4.0"
 linecache2 = "==1.0.0"
 lxml = "*"
@@ -80,15 +79,21 @@ flask = "==2.3.2"
 certifi = "*"
 Markdown = "*"
 dc-django-utils = {file = "https://github.com/DemocracyClub/dc_django_utils/archive/refs/tags/7.0.1.tar.gz"}
+playwright = "==1.48.0"
+pytest-django = "*"
+pytest = "*"
+pytest-playwright = "*"
+pytest-cov = "*"
+moto = "*"
 
 [requires]
 python_version = "3.12"
 
 [scripts]
-collectstatic = "python manage.py collectstatic -c --noinput"
+collectstatic = "python manage.py collectstatic --noinput"
 createcachetable = "python manage.py createcachetable"
 coveralls = "coveralls"
 migratedb = "python manage.py migrate --noinput"
 makemigrations = "python manage.py makemigrations"
 thumbs_sam_build = "bash -c 'cd thumbs && sam build'"
-test = "bash -c 'DJANGO_SETTINGS_MODULE=electionleaflets.settings.testing python manage.py test'"
+test = "pytest"

README.md

@@ -70,24 +70,4 @@ The app is deployed to AWS using the [Serverless
 Framework](https://serverless.com/). This manages resources in AWS Lambda and
 AWS API Gateway.
 
-To deploy:
-
-1. Install `serverless` with `npm install -g serverless`
-2. Install plugins with `npm install`
-3. Deploy to `staging` with `sls deploy --stage=staging`
-4. Test at https://staging.electionleaflets.org/
-5. Deploy to production with `sls deploy --stage=production`
-
-We use this now instead of Zappa for a few reasons:
-
-- Zappa seems to now be unsupported.
-- `sls` has become the industry standard and has a good plugin ecosystem.
-- `sls` will manage domains and CloudFront distributions for us.
-
-The main differences are:
-
-- `sls` stores secrets in AWS SSM Parameter Store, instead of a JSON file in S3.
-  Manage these in the [Parameter Store
-  Console](https://eu-west-1.console.aws.amazon.com/systems-manager/parameters).
-- `sls` uses API Gateway to manage CloudFront distributions. This means the
-  distributions will not show in the CloudFront console.
+The app is deployed through CircleCI. The staging deployment is triggered by temporarily adding the current branch to context in the sam-deploy job. The production deployment is triggered by merging to master.