From 6c1667e05a2e9d8346c9f03a138e5d8c6184aa78 Mon Sep 17 00:00:00 2001 From: Shagen Ogandzhanian Date: Tue, 24 Aug 2021 20:23:41 +0200 Subject: [PATCH] [web] [tests] Refactor attributesUpdateShouldNotCauseInlineStylesCleanUp and make sure we check conditional class assignemnt (in combination with seeting style) as well --- .../jsTest/kotlin/elements/AttributesTests.kt | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/web/core/src/jsTest/kotlin/elements/AttributesTests.kt b/web/core/src/jsTest/kotlin/elements/AttributesTests.kt index aab8645f65..5ae91273e2 100644 --- a/web/core/src/jsTest/kotlin/elements/AttributesTests.kt +++ b/web/core/src/jsTest/kotlin/elements/AttributesTests.kt @@ -340,34 +340,30 @@ class AttributesTests { composition { Button(attrs = { + classes("a") style { color(Color.red) } - if (hasValue) value("buttonValue") + if (hasValue) { + classes("b") + value("buttonValue") + } }) { Text("Button") } } assertEquals( - expected = "color: red;", - actual = (root.firstChild as HTMLButtonElement).getAttribute("style") - ) - assertEquals( - expected = null, - actual = (root.firstChild as HTMLButtonElement).getAttribute("value") + expected = "", + actual = nextChild().outerHTML ) hasValue = true waitForRecompositionComplete() assertEquals( - expected = "color: red;", - actual = (root.firstChild as HTMLButtonElement).getAttribute("style") - ) - assertEquals( - expected = "buttonValue", - actual = (root.firstChild as HTMLButtonElement).getAttribute("value") + expected = "", + actual = currentChild().outerHTML ) } }