Merge branch 'dev' into feature/new-tariffs

# Conflicts: # .gitignore # bot/app/web/subscription_webapp.py # tests/test_settings.py
2026-04-30 10:52:20 +03:00
parent 4958e1fdfd 4d0241a0ea
commit ce610b4804
39 changed files with 6813 additions and 8192 deletions
@@ -80,3 +80,14 @@ class SettingsTests(unittest.TestCase):

            self.assertIsNotNone(settings.tariffs_config)
            self.assertFalse(settings.traffic_sale_mode)
+
+    def test_trial_traffic_strategy_is_available(self):
+        settings = Settings(
+            _env_file=None,
+            BOT_TOKEN="token",
+            POSTGRES_USER="app_user",
+            POSTGRES_PASSWORD="app_password",
+            TRIAL_TRAFFIC_STRATEGY="WEEK",
+        )
+
+        self.assertEqual(settings.TRIAL_TRAFFIC_STRATEGY, "WEEK")