refactor/qg-290: выделена логика формирования дескриптора элемента для Jsoup и Selenide

Author: d-r-q

app/src/testFixtures/kotlin/pro/qyoga/tests/assertions/ElementMatchers.kt

@@ -10,6 +10,7 @@ import org.springframework.web.util.UriTemplate
 import pro.qyoga.tests.platform.html.Component
 import pro.qyoga.tests.platform.html.HtmlPage
 import pro.qyoga.tests.platform.html.Input
+import pro.qyoga.tests.platform.html.elementDescr
 
 
 fun beComponent(component: Component) = Matcher<Element> { element ->
@@ -189,19 +190,14 @@ fun haveCheckboxChecked(
 }
 
 val Element.descr: String
-    get() {
-        val selector = if (this.id().isNotEmpty()) {
-            "id=\"${this.id()}\""
-        } else if (this.classNames().isNotEmpty()) {
-            "class=\"${this.classNames().first()}\" ..."
-        } else {
-            ""
-        }
-        return "<${this.tag().name} $selector>" +
-                this.text().take(32) +
-                ("...".takeIf { this.text().length > 32 } ?: "") +
-                "</${this.tag().name}>"
-    }
+    get() =
+        elementDescr(
+            this.tag().name,
+            this.id(),
+            this.classNames().firstOrNull(),
+            this.attr("name"),
+            this.text()
+        )
 
 infix fun Element.shouldHaveComponent(component: Component): Element {
     this should haveComponent(component)

app/src/testFixtures/kotlin/pro/qyoga/tests/platform/html/Elements.kt

@@ -0,0 +1,21 @@
+package pro.qyoga.tests.platform.html
+
+
+fun elementDescr(
+    tag: String,
+    idValue: String?,
+    elClassValue: String?,
+    nameValue: String?,
+    text: String?
+): String {
+    val id = idValue?.takeIf { it.isNotBlank() }
+        ?.let { "id=\"$it\"" } ?: ""
+    val elClass = elClassValue?.takeIf { it.isNotBlank() }
+        ?.let { "class=\"${it.split(" ").first()} ...\"" } ?: ""
+    val name = nameValue?.takeIf { it.isNotBlank() }
+        ?.let { "name=\"$it\"" } ?: ""
+
+    return "<$tag $id $elClass $name>" +
+            (text?.take(16)?.let { "$it ..." } ?: "") +
+            "</$tag>"
+}

e2e-tests/src/test/kotlin/pro/qyoga/tests/assertions/SelenideElement.kt

@@ -3,6 +3,7 @@ package pro.qyoga.tests.assertions
 import com.codeborne.selenide.SelenideElement
 import io.kotest.matchers.Matcher
 import io.kotest.matchers.MatcherResult
+import pro.qyoga.tests.platform.html.elementDescr
 import io.kotest.matchers.should as koshould
 import io.kotest.matchers.shouldNot as koshouldNot
 
@@ -32,14 +33,11 @@ fun SelenideElement.shouldNotBeEmptyInput() {
 }
 
 fun SelenideElement.descr(): String {
-    val id = this.getAttribute("id")
-        ?.takeIf { it.isNotBlank() }
-        ?.let { "id=\"$it\"" } ?: ""
-    val elClass = this.getAttribute("class")
-        ?.takeIf { it.isNotBlank() }
-        ?.let { "class=\"${it.split(" ").first()} ...\"" } ?: ""
-    val name = this.getAttribute("name")
-        ?.takeIf { it.isNotBlank() }
-        ?.let { "name=\"$it\"" } ?: ""
-    return "<${this.tagName} $id $elClass $name/>"
+    return elementDescr(
+        this.tagName,
+        getAttribute("id"),
+        getAttribute("class"),
+        getAttribute("name"),
+        this.text
+    )
 }

e2e-tests/src/test/kotlin/pro/qyoga/tests/scenarios/CreateClientScenarioTest.kt

@@ -49,4 +49,4 @@ class CreateClientScenarioTest : QYogaE2EBaseTest() {
         CreateClientForm.shouldBeEmpty()
     }
 
-}
+}