From fb4a3ea99abb21450c2e55fbc5c545509956ecbf Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Fri, 18 Feb 2022 00:12:32 +0100
Subject: [PATCH] Fix tests

---
 Models/ThemeConfig/Conversion/Validation.ts | 4 ++--
 test/LegacyThemeLoader.spec.ts              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Models/ThemeConfig/Conversion/Validation.ts b/Models/ThemeConfig/Conversion/Validation.ts
index 398a78268..a0a3aff48 100644
--- a/Models/ThemeConfig/Conversion/Validation.ts
+++ b/Models/ThemeConfig/Conversion/Validation.ts
@@ -226,7 +226,7 @@ export class DetectShadowedMappings extends DesugaringStep<TagRenderingConfigJso
         }
         const parsedConditions = json.mappings.map(m => TagUtils.Tag(m.if))
         for (let i = 0; i < json.mappings.length; i++) {
-            if (!parsedConditions[i].isUsableAsAnswer()) {
+            if(json.mappings[i].hideInAnswer === true){
                 continue
             }
             const keyValues = parsedConditions[i].asChange({});
@@ -241,7 +241,7 @@ export class DetectShadowedMappings extends DesugaringStep<TagRenderingConfigJso
                 const doesMatch = parsedConditions[j].matchesProperties(properties)
                 if (doesMatch) {
                     // The current mapping is shadowed!
-                    warnings.push(`At ${context}: Mapping ${i} is shadowed by mapping ${j} and will thus never be shown:
+                    errors.push(`At ${context}: Mapping ${i} is shadowed by mapping ${j} and will thus never be shown:
     The mapping ${parsedConditions[i].asHumanString(false, false, {})} is fully matched by a previous mapping, which matches:
     ${parsedConditions[j].asHumanString(false, false, {})}.
     
diff --git a/test/LegacyThemeLoader.spec.ts b/test/LegacyThemeLoader.spec.ts
index a2e8b63d7..83284c5be 100644
--- a/test/LegacyThemeLoader.spec.ts
+++ b/test/LegacyThemeLoader.spec.ts
@@ -423,7 +423,7 @@ export default class LegacyThemeLoaderSpec extends T {
                                 }
                             ]
                         }, "test");
-                    T.isTrue(r.errors.length > 0, "Failing case is not detected")
+                    T.isTrue(r.errors.length > 0, "Failing case 0 is not detected")
 
                         const r0 = new DetectShadowedMappings().convert( {
                             mappings: [
@@ -437,7 +437,7 @@ export default class LegacyThemeLoaderSpec extends T {
                                 }
                             ]
                         }, "test");
-                        T.isTrue(r0.errors.length > 0, "Failing case is not detected")
+                        T.isTrue(r0.errors.length > 0, "Failing case 1 is not detected")
                     }
                 ],
             ["Images are rewritten", () => {