Merge remote-tracking branch 'upstream/ep2021' into ep2021

Author: fpierfed

conference/fares.py

@@ -24,10 +24,11 @@
 FARE_CODE_VARIANTS = Choices(
     ("S", "STANDARD", "Standard"),
     ("L", "LIGHT",    "Standard Light (no trainings)"),
-    ("T", "TRAINING", "Trainings (ep2018+)"), # Starting with EP2018
-    ("C", "COMBINED", "Combined (ep2019+)"), # Starting with EP2019
-    ("P", "SPRINT", "Sprints only"), # Starting with EP2020
+    ("T", "TRAINING", "Trainings (ep2018+)"),   # Starting with EP2018
+    ("C", "COMBINED", "Combined (ep2019+)"),    # Starting with EP2019
+    ("P", "SPRINT", "Sprints only"),            # Starting with EP2020
     ("D", "DAYPASS",  "Day Pass"),
+    ("V", "STREAM",  "Stream only"),            # Starting with EP2021
 )
 
 # Variants eligible for talk voting

tests/test_cart.py

@@ -154,9 +154,9 @@ def test_cant_buy_any_tickets_if_fares_are_not_available(db, user_client):
 @mark.parametrize(
     "ticket_category, expected_ticket_types",
     [
-        ('personal', ['TRSP', 'TRLP', 'TRTP', 'TRCP', 'TRDP', 'TRPP']),
-        ('company', ['TRSC', 'TRLC', 'TRTC', 'TRCC', 'TRDC', 'TRPC']),
-        ('student', ['TRSS', 'TRLS', 'TRTS', 'TRCS', 'TRDS', 'TRPS']),
+        ('personal', ['TRSP', 'TRLP', 'TRTP', 'TRCP', 'TRDP', 'TRPP', 'TRVP']),
+        ('company', ['TRSC', 'TRLC', 'TRTC', 'TRCC', 'TRDC', 'TRPC', 'TRVC']),
+        ('student', ['TRSS', 'TRLS', 'TRTS', 'TRCS', 'TRDS', 'TRPS', 'TRVS']),
         ('other', ['SIM1', 'VOUPE03']),
     ],
 )