From bccf783976e5df1f800d1268dcdbe1b5140506d5 Mon Sep 17 00:00:00 2001 From: Oleksandr Karpovich Date: Mon, 14 Feb 2022 13:58:36 +0100 Subject: [PATCH] web: make canvasAttributeTest independent of attributes order --- .../src/jsTest/kotlin/elements/AttributesTests.kt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/web/core/src/jsTest/kotlin/elements/AttributesTests.kt b/web/core/src/jsTest/kotlin/elements/AttributesTests.kt index 8f1774db1b..4b83b1ca29 100644 --- a/web/core/src/jsTest/kotlin/elements/AttributesTests.kt +++ b/web/core/src/jsTest/kotlin/elements/AttributesTests.kt @@ -9,13 +9,11 @@ import kotlinx.dom.clear import org.jetbrains.compose.web.attributes.* import org.jetbrains.compose.web.css.* import org.jetbrains.compose.web.dom.* -import org.w3c.dom.HTMLButtonElement -import org.w3c.dom.HTMLDivElement -import org.w3c.dom.HTMLElement +import org.jetbrains.compose.web.dom.Text import kotlin.test.Test import kotlin.test.assertEquals import org.jetbrains.compose.web.testutils.* -import org.w3c.dom.HTMLInputElement +import org.w3c.dom.* import kotlin.test.assertContains import kotlin.test.assertTrue @@ -556,9 +554,14 @@ class AttributesTests { composition { Canvas({ height(400.px) - width(400.px) + width(450.px) }) } - assertEquals("""""",root.innerHTML) + with(nextChild() as HTMLCanvasElement) { + val attrsMap = getAttributeNames().associateWith { getAttribute(it) } + assertEquals(2, attrsMap.size) + assertEquals("450px", attrsMap["width"]) + assertEquals("400px", attrsMap["height"]) + } } }