aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Jaros <rjaros@finn.pl>2019-01-09 12:19:18 +0100
committerRobert Jaros <rjaros@finn.pl>2019-01-09 12:19:18 +0100
commitec61850780cac4e84826aca95a14d8010813b13a (patch)
tree78a7c7f4e8ee041255b29093707537a5faf27218
parentd74b2813ac456ce3a69ba2afc2f8409f30c92cda (diff)
downloadkvision-ec61850780cac4e84826aca95a14d8010813b13a.tar.gz
kvision-ec61850780cac4e84826aca95a14d8010813b13a.tar.bz2
kvision-ec61850780cac4e84826aca95a14d8010813b13a.zip
Dependencies upgrade.
-rw-r--r--build.gradle5
-rw-r--r--kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt6
-rw-r--r--kvision-modules/kvision-common-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt5
-rw-r--r--kvision-modules/kvision-datetime/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt6
-rw-r--r--kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt6
-rw-r--r--kvision-modules/kvision-remote/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt99
-rw-r--r--kvision-modules/kvision-remote/src/test/kotlin/test/pl/treksoft/kvision/form/upload/UploadInputSpec.kt57
-rw-r--r--kvision-modules/kvision-remote/src/test/kotlin/test/pl/treksoft/kvision/form/upload/UploadSpec.kt56
-rw-r--r--kvision-modules/kvision-richtext/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt6
-rw-r--r--kvision-modules/kvision-select/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt6
-rw-r--r--kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt6
-rw-r--r--kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt1
-rw-r--r--kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt6
-rw-r--r--kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt11
-rw-r--r--kvision-modules/kvision-spinner/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt6
-rw-r--r--kvision-modules/kvision-upload/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt6
-rw-r--r--src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt6
-rw-r--r--src/test/kotlin/test/pl/treksoft/kvision/core/WidgetSpec.kt4
18 files changed, 34 insertions, 264 deletions
diff --git a/build.gradle b/build.gradle
index 1d387f9f..84b7c574 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,6 +30,7 @@ configure(allprojects - project(':kvision-modules')) {
maven { url = 'https://kotlin.bintray.com/kotlinx' }
maven { url = 'https://dl.bintray.com/gbaldeck/kotlin' }
maven { url = 'https://dl.bintray.com/rjaros/kotlin' }
+ mavenLocal()
}
}
@@ -114,8 +115,8 @@ dependencies {
testCompile "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
}
compile "com.github.snabbdom:snabbdom-kotlin:0.1.1"
- compile "pl.treksoft:navigo-kotlin:0.0.2"
- compile "pl.treksoft:jquery-kotlin:0.0.3"
+ compile "pl.treksoft:navigo-kotlin:0.0.3"
+ compile "pl.treksoft:jquery-kotlin:0.0.4"
compile "pl.treksoft:kotlin-observable-js:0.0.3"
}
diff --git a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt
index 6e30f12c..5f55a1f8 100644
--- a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt
+++ b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt
@@ -64,13 +64,13 @@ interface DomSpec : TestSpec {
override fun afterTest() {
val div = document.getElementById("pretest")
div?.let { jQuery(it).remove() }
- jQuery(`object` = ".modal-backdrop").remove()
+ jQuery(".modal-backdrop").remove()
}
fun assertEqualsHtml(expected: String?, actual: String?, message: String?) {
if (expected != null && actual != null) {
- val exp = jQuery(html = expected)
- val act = jQuery(html = actual)
+ val exp = jQuery(expected)
+ val act = jQuery(actual)
val result = exp[0]?.isEqualNode(act[0])
if (result == true) {
assertTrue(result == true, message)
diff --git a/kvision-modules/kvision-common-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt b/kvision-modules/kvision-common-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt
index cf822e66..4933624e 100644
--- a/kvision-modules/kvision-common-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt
+++ b/kvision-modules/kvision-common-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt
@@ -27,11 +27,6 @@ package pl.treksoft.kvision.remote
expect open class KVServer
/**
- * A server request.
- */
-expect interface Request
-
-/**
* A user profile.
*/
expect class Profile
diff --git a/kvision-modules/kvision-datetime/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/kvision-modules/kvision-datetime/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt
index 1da1fe1a..9d86766c 100644
--- a/kvision-modules/kvision-datetime/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt
+++ b/kvision-modules/kvision-datetime/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt
@@ -62,13 +62,13 @@ interface DomSpec : TestSpec {
override fun afterTest() {
val div = document.getElementById("pretest")
div?.let { jQuery(it).remove() }
- jQuery(`object` = ".modal-backdrop").remove()
+ jQuery(".modal-backdrop").remove()
}
fun assertEqualsHtml(expected: String?, actual: String?, message: String?) {
if (expected != null && actual != null) {
- val exp = jQuery(html = expected)
- val act = jQuery(html = actual)
+ val exp = jQuery(expected)
+ val act = jQuery(actual)
val result = exp[0]?.isEqualNode(act[0])
if (result == true) {
assertTrue(result == true, message)
diff --git a/kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt b/kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt
index a1cc40ca..7b74ab00 100644
--- a/kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt
+++ b/kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt
@@ -31,12 +31,6 @@ import kotlinx.serialization.Transient
actual open class KVServer
/**
- * A server request.
- * Not used on the js platform.
- */
-actual interface Request
-
-/**
* A user profile.
*/
@Serializable
diff --git a/kvision-modules/kvision-remote/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/kvision-modules/kvision-remote/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt
deleted file mode 100644
index 1da1fe1a..00000000
--- a/kvision-modules/kvision-remote/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2017-present Robert Jaros
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package test.pl.treksoft.kvision
-
-import org.w3c.dom.Element
-import pl.treksoft.jquery.jQuery
-import pl.treksoft.kvision.core.Widget
-import pl.treksoft.kvision.panel.Root
-import kotlin.browser.document
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
-
-interface TestSpec {
- fun beforeTest()
-
- fun afterTest()
-
- fun run(code: () -> Unit) {
- beforeTest()
- code()
- afterTest()
- }
-}
-
-interface SimpleSpec : TestSpec {
-
- override fun beforeTest() {
- }
-
- override fun afterTest() {
- }
-
-}
-
-interface DomSpec : TestSpec {
-
- override fun beforeTest() {
- val fixture = "<div style=\"display: none\" id=\"pretest\">" +
- "<div id=\"test\"></div></div>"
- document.body?.insertAdjacentHTML("afterbegin", fixture)
- }
-
- override fun afterTest() {
- val div = document.getElementById("pretest")
- div?.let { jQuery(it).remove() }
- jQuery(`object` = ".modal-backdrop").remove()
- }
-
- fun assertEqualsHtml(expected: String?, actual: String?, message: String?) {
- if (expected != null && actual != null) {
- val exp = jQuery(html = expected)
- val act = jQuery(html = actual)
- val result = exp[0]?.isEqualNode(act[0])
- if (result == true) {
- assertTrue(result == true, message)
- } else {
- assertEquals(expected, actual, message)
- }
- } else {
- assertEquals(expected, actual, message)
- }
- }
-}
-
-interface WSpec : DomSpec {
-
- fun runW(code: (widget: Widget, element: Element?) -> Unit) {
- run {
- val root = Root("test", true)
- val widget = Widget()
- widget.id = "test_id"
- root.add(widget)
- val element = document.getElementById("test_id")
- code(widget, element)
- }
- }
-
-}
-
-external fun require(name: String): dynamic
diff --git a/kvision-modules/kvision-remote/src/test/kotlin/test/pl/treksoft/kvision/form/upload/UploadInputSpec.kt b/kvision-modules/kvision-remote/src/test/kotlin/test/pl/treksoft/kvision/form/upload/UploadInputSpec.kt
deleted file mode 100644
index 626b70e4..00000000
--- a/kvision-modules/kvision-remote/src/test/kotlin/test/pl/treksoft/kvision/form/upload/UploadInputSpec.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2017-present Robert Jaros
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package test.pl.treksoft.kvision.form.upload
-
-import pl.treksoft.jquery.jQuery
-import pl.treksoft.kvision.form.upload.UploadInput
-import pl.treksoft.kvision.panel.Root
-import test.pl.treksoft.kvision.DomSpec
-import kotlin.browser.document
-import kotlin.test.Test
-
-class UploadInputSpec : DomSpec {
-
- @Test
- fun render() {
- run {
- val root = Root("test", true)
- val upi = UploadInput(multiple = true).apply {
- id = "idti"
- }
- root.add(upi)
- val content = document.getElementById("test")?.let { jQuery(it).find("input.form-control")[0]?.outerHTML }
- assertEqualsHtml(
- "<input class=\"form-control\" id=\"idti\" type=\"file\" multiple=\"true\">",
- content,
- "Should render correct file input control for multiple files"
- )
- upi.multiple = false
- val content2 = document.getElementById("test")?.let { jQuery(it).find("input.form-control")[0]?.outerHTML }
- assertEqualsHtml(
- "<input class=\"form-control\" id=\"idti\" type=\"file\">",
- content2,
- "Should render correct file input control for single file"
- )
- }
- }
-
-}
diff --git a/kvision-modules/kvision-remote/src/test/kotlin/test/pl/treksoft/kvision/form/upload/UploadSpec.kt b/kvision-modules/kvision-remote/src/test/kotlin/test/pl/treksoft/kvision/form/upload/UploadSpec.kt
deleted file mode 100644
index bea4ddee..00000000
--- a/kvision-modules/kvision-remote/src/test/kotlin/test/pl/treksoft/kvision/form/upload/UploadSpec.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2017-present Robert Jaros
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package test.pl.treksoft.kvision.form.upload
-
-import pl.treksoft.jquery.jQuery
-import pl.treksoft.kvision.form.upload.Upload
-import pl.treksoft.kvision.panel.Root
-import test.pl.treksoft.kvision.DomSpec
-import kotlin.browser.document
-import kotlin.test.Test
-
-class UploadSpec : DomSpec {
-
- @Test
- fun render() {
- run {
- val root = Root("test", true)
- val upi = Upload(multiple = true)
- val id = upi.input.id
- root.add(upi)
- val content = document.getElementById("test")?.let { jQuery(it).find("input.form-control")[0]?.outerHTML }
- assertEqualsHtml(
- "<input class=\"form-control\" id=\"$id\" type=\"file\" multiple=\"true\">",
- content,
- "Should render correct file input control for multiple files"
- )
- upi.multiple = false
- val content2 = document.getElementById("test")?.let { jQuery(it).find("input.form-control")[0]?.outerHTML }
- assertEqualsHtml(
- "<input class=\"form-control\" id=\"$id\" type=\"file\">",
- content2,
- "Should render correct file input control for single file"
- )
- }
- }
-
-}
diff --git a/kvision-modules/kvision-richtext/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/kvision-modules/kvision-richtext/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt
index 1da1fe1a..9d86766c 100644
--- a/kvision-modules/kvision-richtext/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt
+++ b/kvision-modules/kvision-richtext/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt
@@ -62,13 +62,13 @@ interface DomSpec : TestSpec {
override fun afterTest() {
val div = document.getElementById("pretest")
div?.let { jQuery(it).remove() }
- jQuery(`object` = ".modal-backdrop").remove()
+ jQuery(".modal-backdrop").remove()
}
fun assertEqualsHtml(expected: String?, actual: String?, message: String?) {
if (expected != null && actual != null) {
- val exp = jQuery(html = expected)
- val act = jQuery(html = actual)
+ val exp = jQuery(expected)
+ val act = jQuery(actual)
val result = exp[0]?.isEqualNode(act[0])
if (result == true) {
assertTrue(result == true, message)
diff --git a/kvision-modules/kvision-select/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/kvision-modules/kvision-select/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt
index 1da1fe1a..9d86766c 100644
--- a/kvision-modules/kvision-select/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt
+++ b/kvision-modules/kvision-select/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt
@@ -62,13 +62,13 @@ interface DomSpec : TestSpec {
override fun afterTest() {
val div = document.getElementById("pretest")
div?.let { jQuery(it).remove() }
- jQuery(`object` = ".modal-backdrop").remove()
+ jQuery(".modal-backdrop").remove()
}
fun assertEqualsHtml(expected: String?, actual: String?, message: String?) {
if (expected != null && actual != null) {
- val exp = jQuery(html = expected)
- val act = jQuery(html = actual)
+ val exp = jQuery(expected)
+ val act = jQuery(actual)
val result = exp[0]?.isEqualNode(act[0])
if (result == true) {
assertTrue(result == true, message)
diff --git a/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt b/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt
index 05681349..d447cf28 100644
--- a/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt
+++ b/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt
@@ -23,6 +23,7 @@ package pl.treksoft.kvision.remote
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import org.jooby.Kooby
+import org.jooby.Request
import org.jooby.json.Jackson
import org.pac4j.core.profile.CommonProfile
import pl.treksoft.kvision.types.KV_DATE_FORMAT
@@ -49,11 +50,6 @@ actual open class KVServer(init: KVServer.() -> Unit) : Kooby() {
}
/**
- * A server request.
- */
-actual typealias Request = org.jooby.Request
-
-/**
* A user profile.
*/
actual typealias Profile = CommonProfile
diff --git a/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt b/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt
index 958699f1..63d3b1f3 100644
--- a/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt
+++ b/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt
@@ -26,6 +26,7 @@ import com.google.inject.Injector
import kotlinx.coroutines.CoroutineStart
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
+import org.jooby.Request
import org.jooby.Response
import org.slf4j.Logger
import org.slf4j.LoggerFactory
diff --git a/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt b/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt
index ba7264e8..b0052be0 100644
--- a/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt
+++ b/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt
@@ -27,7 +27,6 @@ import org.pac4j.core.profile.CommonProfile
import org.pac4j.core.profile.ProfileManager
import org.springframework.web.context.request.RequestContextHolder
import org.springframework.web.context.request.ServletRequestAttributes
-import javax.servlet.http.HttpServletRequest
import kotlinx.coroutines.async as coroutinesAsync
/**
@@ -36,11 +35,6 @@ import kotlinx.coroutines.async as coroutinesAsync
actual open class KVServer(val services: List<KVServiceManager<*>>)
/**
- * A server request.
- */
-actual typealias Request = HttpServletRequest
-
-/**
* A user profile.
*/
actual typealias Profile = CommonProfile
diff --git a/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt b/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt
index 24c6c9db..8513c128 100644
--- a/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt
+++ b/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt
@@ -30,6 +30,7 @@ import org.slf4j.Logger
import org.slf4j.LoggerFactory
import pl.treksoft.kvision.types.KV_DATE_FORMAT
import java.text.SimpleDateFormat
+import javax.servlet.http.HttpServletRequest
import javax.servlet.http.HttpServletResponse
import kotlin.reflect.KClass
@@ -43,10 +44,10 @@ actual open class KVServiceManager<T : Any> actual constructor(val serviceClass:
val LOG: Logger = LoggerFactory.getLogger(KVServiceManager::class.java.name)
}
- val postRequests: MutableMap<String, (Request, HttpServletResponse) -> Unit> = mutableMapOf()
- val putRequests: MutableMap<String, (Request, HttpServletResponse) -> Unit> = mutableMapOf()
- val deleteRequests: MutableMap<String, (Request, HttpServletResponse) -> Unit> = mutableMapOf()
- val optionsRequests: MutableMap<String, (Request, HttpServletResponse) -> Unit> = mutableMapOf()
+ val postRequests: MutableMap<String, (HttpServletRequest, HttpServletResponse) -> Unit> = mutableMapOf()
+ val putRequests: MutableMap<String, (HttpServletRequest, HttpServletResponse) -> Unit> = mutableMapOf()
+ val deleteRequests: MutableMap<String, (HttpServletRequest, HttpServletResponse) -> Unit> = mutableMapOf()
+ val optionsRequests: MutableMap<String, (HttpServletRequest, HttpServletResponse) -> Unit> = mutableMapOf()
val mapper = jacksonObjectMapper().apply {
dateFormat = SimpleDateFormat(KV_DATE_FORMAT)
@@ -426,7 +427,7 @@ actual open class KVServiceManager<T : Any> actual constructor(val serviceClass:
fun addRoute(
method: RpcHttpMethod,
path: String,
- handler: (Request, HttpServletResponse) -> Unit
+ handler: (HttpServletRequest, HttpServletResponse) -> Unit
) {
when (method) {
RpcHttpMethod.POST -> postRequests[path] = handler
diff --git a/kvision-modules/kvision-spinner/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/kvision-modules/kvision-spinner/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt
index 1da1fe1a..9d86766c 100644
--- a/kvision-modules/kvision-spinner/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt
+++ b/kvision-modules/kvision-spinner/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt
@@ -62,13 +62,13 @@ interface DomSpec : TestSpec {
override fun afterTest() {
val div = document.getElementById("pretest")
div?.let { jQuery(it).remove() }
- jQuery(`object` = ".modal-backdrop").remove()
+ jQuery(".modal-backdrop").remove()
}
fun assertEqualsHtml(expected: String?, actual: String?, message: String?) {
if (expected != null && actual != null) {
- val exp = jQuery(html = expected)
- val act = jQuery(html = actual)
+ val exp = jQuery(expected)
+ val act = jQuery(actual)
val result = exp[0]?.isEqualNode(act[0])
if (result == true) {
assertTrue(result == true, message)
diff --git a/kvision-modules/kvision-upload/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/kvision-modules/kvision-upload/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt
index 1da1fe1a..9d86766c 100644
--- a/kvision-modules/kvision-upload/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt
+++ b/kvision-modules/kvision-upload/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt
@@ -62,13 +62,13 @@ interface DomSpec : TestSpec {
override fun afterTest() {
val div = document.getElementById("pretest")
div?.let { jQuery(it).remove() }
- jQuery(`object` = ".modal-backdrop").remove()
+ jQuery(".modal-backdrop").remove()
}
fun assertEqualsHtml(expected: String?, actual: String?, message: String?) {
if (expected != null && actual != null) {
- val exp = jQuery(html = expected)
- val act = jQuery(html = actual)
+ val exp = jQuery(expected)
+ val act = jQuery(actual)
val result = exp[0]?.isEqualNode(act[0])
if (result == true) {
assertTrue(result == true, message)
diff --git a/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt
index 1da1fe1a..9d86766c 100644
--- a/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt
+++ b/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt
@@ -62,13 +62,13 @@ interface DomSpec : TestSpec {
override fun afterTest() {
val div = document.getElementById("pretest")
div?.let { jQuery(it).remove() }
- jQuery(`object` = ".modal-backdrop").remove()
+ jQuery(".modal-backdrop").remove()
}
fun assertEqualsHtml(expected: String?, actual: String?, message: String?) {
if (expected != null && actual != null) {
- val exp = jQuery(html = expected)
- val act = jQuery(html = actual)
+ val exp = jQuery(expected)
+ val act = jQuery(actual)
val result = exp[0]?.isEqualNode(act[0])
if (result == true) {
assertTrue(result == true, message)
diff --git a/src/test/kotlin/test/pl/treksoft/kvision/core/WidgetSpec.kt b/src/test/kotlin/test/pl/treksoft/kvision/core/WidgetSpec.kt
index a68011d1..fc1cc761 100644
--- a/src/test/kotlin/test/pl/treksoft/kvision/core/WidgetSpec.kt
+++ b/src/test/kotlin/test/pl/treksoft/kvision/core/WidgetSpec.kt
@@ -95,7 +95,7 @@ class WidgetSpec : WSpec {
@Test
fun setEventListener() {
runW { widget, _ ->
- widget.setEventListener { click = { _ -> } }
+ widget.setEventListener { click = { } }
assertTrue("Element should have an event listener") { widget.listeners.size == 1 }
}
}
@@ -103,7 +103,7 @@ class WidgetSpec : WSpec {
@Test
fun removeEventListener() {
runW { widget, _ ->
- widget.setEventListener { click = { _ -> } }
+ widget.setEventListener { click = { } }
widget.removeEventListeners()
assertTrue("Element should not have any event listener") { widget.listeners.size == 0 }
}