diff --git a/vasl_templates/webapp/data/default-template-pack/national-capabilities.json b/vasl_templates/webapp/data/default-template-pack/national-capabilities.json index 77c7ae2..86fd580 100644 --- a/vasl_templates/webapp/data/default-template-pack/national-capabilities.json +++ b/vasl_templates/webapp/data/default-template-pack/national-capabilities.json @@ -8,9 +8,7 @@ "notes": [ "{? 10/1943- | Inherent PF | No Inherent PF | Inherent PF10/43+ ?}", "{? 01/1944- | Inherent ATMM | No Inherent ATMM | Inherent ATMM44+ ?}", - "SS: Disrupt & RtPh Surrender NA
vs Russians", - "Massacre OK", - "{? 01/1944- | Squad Assault Fire | No Squad Assault Fire | Squad Assault Fire44+ ?}" + "SS: " ] }, diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/german/1940.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/german/1940.txt index bec0c8b..7af24ef 100644 --- a/vasl_templates/webapp/tests/fixtures/nat-caps/german/1940.txt +++ b/vasl_templates/webapp/tests/fixtures/nat-caps/german/1940.txt @@ -7,6 +7,7 @@ OBA: 8B 3R (access: ≤ 2) * No Inherent PF * No Inherent ATMM -* SS: Disrupt & RtPh Surrender NA vs Russians -* Massacre OK -* No Squad Assault Fire +* SS: + * Disrupt & RtPh Surrender NA vs Russians + * Massacre OK + * No Squad Assault Fire diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/german/1941.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/german/1941.txt index f9f4f02..1387ac5 100644 --- a/vasl_templates/webapp/tests/fixtures/nat-caps/german/1941.txt +++ b/vasl_templates/webapp/tests/fixtures/nat-caps/german/1941.txt @@ -7,6 +7,7 @@ OBA: 8B 3R (access: ≤ 2) * No Inherent PF * No Inherent ATMM -* SS: Disrupt & RtPh Surrender NA vs Russians -* Massacre OK -* No Squad Assault Fire +* SS: + * Disrupt & RtPh Surrender NA vs Russians + * Massacre OK + * No Squad Assault Fire diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/german/1942.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/german/1942.txt index 42fa08d..394f7db 100644 --- a/vasl_templates/webapp/tests/fixtures/nat-caps/german/1942.txt +++ b/vasl_templates/webapp/tests/fixtures/nat-caps/german/1942.txt @@ -7,6 +7,7 @@ OBA: 8B 3R (access: ≤ 2) * No Inherent PF * No Inherent ATMM -* SS: Disrupt & RtPh Surrender NA vs Russians -* Massacre OK -* No Squad Assault Fire +* SS: + * Disrupt & RtPh Surrender NA vs Russians + * Massacre OK + * No Squad Assault Fire diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/german/1943.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/german/1943.txt index 45aba85..018a8f8 100644 --- a/vasl_templates/webapp/tests/fixtures/nat-caps/german/1943.txt +++ b/vasl_templates/webapp/tests/fixtures/nat-caps/german/1943.txt @@ -7,6 +7,7 @@ OBA: 8B 3R (access: ≤ 2) * No Inherent PF * No Inherent ATMM -* SS: Disrupt & RtPh Surrender NA vs Russians -* Massacre OK -* No Squad Assault Fire +* SS: + * Disrupt & RtPh Surrender NA vs Russians + * Massacre OK + * No Squad Assault Fire diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/german/1944.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/german/1944.txt index ab81f83..372e20c 100644 --- a/vasl_templates/webapp/tests/fixtures/nat-caps/german/1944.txt +++ b/vasl_templates/webapp/tests/fixtures/nat-caps/german/1944.txt @@ -7,6 +7,7 @@ OBA: 8B 3R (access: ≤ 2) * Inherent PF * Inherent ATMM -* SS: Disrupt & RtPh Surrender NA vs Russians -* Massacre OK -* Squad Assault Fire +* SS: + * Disrupt & RtPh Surrender NA vs Russians + * Massacre OK + * Squad Assault Fire diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/german/1945.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/german/1945.txt index ef60021..592f39e 100644 --- a/vasl_templates/webapp/tests/fixtures/nat-caps/german/1945.txt +++ b/vasl_templates/webapp/tests/fixtures/nat-caps/german/1945.txt @@ -7,6 +7,7 @@ OBA: 8B 3R (access: ≤ 2) * Inherent PF * Inherent ATMM -* SS: Disrupt & RtPh Surrender NA vs Russians -* Massacre OK -* Squad Assault Fire +* SS: + * Disrupt & RtPh Surrender NA vs Russians + * Massacre OK + * Squad Assault Fire diff --git a/vasl_templates/webapp/tests/test_national_capabilities.py b/vasl_templates/webapp/tests/test_national_capabilities.py index 22994b5..e175298 100644 --- a/vasl_templates/webapp/tests/test_national_capabilities.py +++ b/vasl_templates/webapp/tests/test_national_capabilities.py @@ -230,16 +230,13 @@ def test_time_based_national_capabilities( webapp, webdriver ): # test the German national capabilities check_notes( "german", "ETO", 12, 1942, [ - "No Inherent PF", "No Inherent ATMM", "No Squad Assault Fire" + "No Inherent PF", "No Inherent ATMM" ] ) check_notes( "german", "ETO", 9, 1943, [ - "No Inherent PF", "No Inherent ATMM", "No Squad Assault Fire" + "No Inherent PF", "No Inherent ATMM" ] ) check_notes( "german", "ETO", 10, 1943, [ - "Inherent PF", "No Inherent ATMM", "No Squad Assault Fire" - ] ) - check_notes( "german", "ETO", 1, 1944, [ - "Inherent PF", "Inherent ATMM", "Squad Assault Fire" + "Inherent PF", "No Inherent ATMM" ] ) # test the Russian national capabilities