diff --git a/.forgejo/workflows/test.yaml b/.forgejo/workflows/test.yaml index 1bc048c..a0cb310 100644 --- a/.forgejo/workflows/test.yaml +++ b/.forgejo/workflows/test.yaml @@ -2,7 +2,7 @@ name: Django Tests on: push: - branches: [main] + branches: ["*"] pull_request: jobs: @@ -31,4 +31,4 @@ jobs: -w /app \ -e SECRET_KEY=dummysecretkey \ website:test \ - sh -c 'uv run --extra dev manage.py migrate --noinput && uv run --extra dev manage.py test hub.services.tests --verbosity=2' + sh -c 'uv run --extra dev manage.py migrate --noinput && uv run --extra dev manage.py test hub.services.tests --verbosity=2' \ No newline at end of file diff --git a/hub/services/tests/test_pricing_edge_cases.py b/hub/services/tests/test_pricing_edge_cases.py index 0363ea8..8a59104 100644 --- a/hub/services/tests/test_pricing_edge_cases.py +++ b/hub/services/tests/test_pricing_edge_cases.py @@ -1,5 +1,6 @@ from decimal import Decimal from django.test import TestCase +from django.core.exceptions import ValidationError from django.utils import timezone from datetime import timedelta @@ -9,12 +10,16 @@ from ..models.services import Service from ..models.pricing import ( ComputePlan, ComputePlanPrice, + StoragePlan, + StoragePlanPrice, ProgressiveDiscountModel, DiscountTier, VSHNAppCatPrice, VSHNAppCatBaseFee, VSHNAppCatUnitRate, VSHNAppCatAddon, + VSHNAppCatAddonBaseFee, + VSHNAppCatAddonUnitRate, ExternalPricePlans, ) @@ -158,8 +163,7 @@ class PricingEdgeCasesTestCase(TestCase): ) # Should return None when price doesn't exist - # For BASE_FEE addons, service_level is required - price = addon.get_price(Currency.CHF, service_level="standard") + price = addon.get_price(Currency.CHF) self.assertIsNone(price) def test_compute_plan_with_validity_dates(self):