chore: fix test CI (#411)

.env

@@ -1,5 +1,3 @@
-# set project name to have a short one
-COMPOSE_PROJECT_NAME=open_prices
 # unify separator with windows style
 COMPOSE_PATH_SEPARATOR=;
 # dev is default target

.github/workflows/quality-check.yml

@@ -35,5 +35,4 @@ jobs:
 
       - name: Launch tests
         run: |
-          make build
           make tests

Makefile

@@ -1,3 +1,11 @@
+#!/usr/bin/make
+
+ifneq (,$(wildcard ./.env))
+    -include .env
+    -include .envrc
+    export
+endif
+
 MOUNT_POINT ?= /mnt
 DOCKER_LOCAL_DATA ?= /srv/off/docker_data
 ENV_FILE ?= .env
@@ -8,11 +16,8 @@ export USER_UID:=${UID}
 # prefer to use docker buildkit
 export DOCKER_BUILDKIT=1
 export COMPOSE_DOCKER_CLI_BUILD=1
-# we need COMPOSE_PROJECT_NAME for some commands
-# take it form env, or from env file
-COMPOSE_PROJECT_NAME ?= $(shell grep COMPOSE_PROJECT_NAME ${ENV_FILE} | cut -d '=' -f 2)
 DOCKER_COMPOSE=docker compose --env-file=${ENV_FILE}
-DOCKER_COMPOSE_TEST=COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME}_test docker compose --env-file=${ENV_FILE}
+DOCKER_COMPOSE_TEST=COMPOSE_PROJECT_NAME=open_prices_test docker compose --env-file=${ENV_FILE}
 
 # avoid target corresponding to file names, to depends on them
 .PHONY: *
@@ -33,7 +38,7 @@ guard-%: # guard clause for targets that require an environment variable (usuall
 #------------#
 
 test:
-	echo ${ENV_FILE} ${COMPOSE_PROJECT_NAME}
+	echo ${ENV_FILE}
 
 livecheck:
 	@echo "🥫 livecheck services…" ; \

docker/dev.yml

@@ -1,6 +1,7 @@
 # this file setup various thinks that are for dev environment
 
 x-api-base: &api-base
+  image: openfoodfacts/open-prices/api:dev
   build:
     context: .
     target: runtime-dev
@@ -9,16 +10,15 @@ x-api-base: &api-base
       USER_GID: ${USER_GID:-1000}
   volumes:
     # mount code dynamically
-    - "./app:/opt/open-prices/app"
+    - "./open_prices:/opt/open-prices/open_prices"
+    - "./config:/opt/open-prices/config"
     - ./pyproject.toml:/opt/open-prices/pyproject.toml
     # make doc generation available
     - ./mkdocs.yml:/opt/open-prices/mkdocs.yml
     - ./build_mkdocs.sh:/opt/open-prices/build_mkdocs.sh
     - ./README.md:/opt/open-prices/README.md
     - ./docs:/opt/open-prices/docs
     - ./gh_pages:/opt/open-prices/gh_pages
-    # make migrations available so that we can run them easily
-    - ./alembic:/opt/open-prices/alembic
     # mount tests
     - ./tests:/opt/open-prices/tests
     - ./manage.py:/opt/open-prices/manage.py

open_prices/api/proofs/tests.py

@@ -1,6 +1,9 @@
+from io import BytesIO
+
 from django.db.models import signals
 from django.test import TestCase
 from django.urls import reverse
+from PIL import Image
 
 from open_prices.locations import constants as location_constants
 from open_prices.locations.models import (
@@ -15,6 +18,14 @@
 PROOF = {"type": proof_constants.TYPE_RECEIPT, "currency": "EUR", "date": "2024-01-01"}
 
 
+def create_fake_image() -> bytes:
+    fp = BytesIO()
+    image = Image.new("RGB", (100, 100))
+    image.save(fp, format="WEBP")
+    fp.seek(0)
+    return fp
+
+
 class ProofListApiTest(TestCase):
     @classmethod
     def setUpTestData(cls):
@@ -151,7 +162,7 @@ def setUpTestData(cls):
         }
 
     def test_proof_create(self):
-        self.data["file"] = open("filename.webp", "rb")
+        self.data["file"] = create_fake_image()
         # anonymous
         response = self.client.post(self.url, self.data)
         self.assertEqual(response.status_code, 403)
@@ -177,7 +188,7 @@ def test_proof_create(self):
         self.assertEqual(p.source, "API")  # default value
 
     def test_proof_create_with_app_name(self):
-        self.data["file"] = open("filename.webp", "rb")
+        self.data["file"] = create_fake_image()
         for app_name in ["", "test app"]:
             # with empty app_name
             response = self.client.post(

pyproject.toml

@@ -19,9 +19,6 @@ profile = "black"
 strict = true
 disable_error_code = ["no-untyped-call", "no-any-return"]
 python_version = "3.11"
-exclude = [
-  'alembic/',
-]
 plugins = [
   "sqlalchemy.ext.mypy.plugin",
   "pydantic.mypy"