Merge pull request #1 from rjaros/master

merge

5 files changed, 10 insertions, 9 deletions

diff --git a/kvision-modules/kvision-spinner/build.gradle b/kvision-modules/kvision-spinner/build.gradle
index e7600e5a..4569b8bc 100644
--- a/kvision-modules/kvision-spinner/build.gradle
+++ b/kvision-modules/kvision-spinner/build.gradle
@@ -6,6 +6,7 @@ kotlinFrontend {
         dependency("bootstrap-touchspin", "4.2.5")
         devDependency("karma", "3.1.4")
         devDependency("karma-chrome-launcher", "2.2.0")
+        devDependency("karma-webpack", "3.0.5")
         devDependency("qunit", "2.8.0")
     }
 
diff --git a/kvision-modules/kvision-spinner/src/main/kotlin/pl/treksoft/kvision/form/spinner/SpinnerInput.kt b/kvision-modules/kvision-spinner/src/main/kotlin/pl/treksoft/kvision/form/spinner/SpinnerInput.kt
index c60aab2f..66e98ab5 100644
--- a/kvision-modules/kvision-spinner/src/main/kotlin/pl/treksoft/kvision/form/spinner/SpinnerInput.kt
+++ b/kvision-modules/kvision-spinner/src/main/kotlin/pl/treksoft/kvision/form/spinner/SpinnerInput.kt
@@ -293,14 +293,14 @@ open class SpinnerInput(
     /**
      * Makes the input element focused.
      */
-    open fun focus() {
+    override fun focus() {
         getElementJQuery()?.focus()
     }
 
     /**
      * Makes the input element blur.
      */
-    open fun blur() {
+    override fun blur() {
         getElementJQuery()?.blur()
     }
 
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 37d7a9df..13c8531b 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
@@ -86,7 +86,7 @@ interface WSpec : DomSpec {
 
     fun runW(code: (widget: Widget, element: Element?) -> Unit) {
         run {
-            val root = Root("test", true)
+            val root = Root("test", fixed = true)
             val widget = Widget()
             widget.id = "test_id"
             root.add(widget)
diff --git a/kvision-modules/kvision-spinner/src/test/kotlin/test/pl/treksoft/kvision/form/spinner/SpinnerInputSpec.kt b/kvision-modules/kvision-spinner/src/test/kotlin/test/pl/treksoft/kvision/form/spinner/SpinnerInputSpec.kt
index a240bfd8..467e48db 100644
--- a/kvision-modules/kvision-spinner/src/test/kotlin/test/pl/treksoft/kvision/form/spinner/SpinnerInputSpec.kt
+++ b/kvision-modules/kvision-spinner/src/test/kotlin/test/pl/treksoft/kvision/form/spinner/SpinnerInputSpec.kt
@@ -32,7 +32,7 @@ class SpinnerInputSpec : DomSpec {
     @Test
     fun render() {
         run {
-            val root = Root("test", true)
+            val root = Root("test", fixed = true)
             val si = SpinnerInput(value = 13).apply {
                 placeholder = "place"
                 id = "idti"
@@ -46,7 +46,7 @@ class SpinnerInputSpec : DomSpec {
     @Test
     fun spinUp() {
         run {
-            val root = Root("test", true)
+            val root = Root("test", fixed = true)
             val si = SpinnerInput(value = 13).apply {
                 placeholder = "place"
                 id = "idti"
@@ -61,7 +61,7 @@ class SpinnerInputSpec : DomSpec {
     @Test
     fun spinDown() {
         run {
-            val root = Root("test", true)
+            val root = Root("test", fixed = true)
             val si = SpinnerInput(value = 13).apply {
                 placeholder = "place"
                 id = "idti"
diff --git a/kvision-modules/kvision-spinner/src/test/kotlin/test/pl/treksoft/kvision/form/spinner/SpinnerSpec.kt b/kvision-modules/kvision-spinner/src/test/kotlin/test/pl/treksoft/kvision/form/spinner/SpinnerSpec.kt
index 30f12a93..928fe0b1 100644
--- a/kvision-modules/kvision-spinner/src/test/kotlin/test/pl/treksoft/kvision/form/spinner/SpinnerSpec.kt
+++ b/kvision-modules/kvision-spinner/src/test/kotlin/test/pl/treksoft/kvision/form/spinner/SpinnerSpec.kt
@@ -33,7 +33,7 @@ class SpinnerSpec : DomSpec {
     @Test
     fun render() {
         run {
-            val root = Root("test", true)
+            val root = Root("test", fixed = true)
             val ti = Spinner(value = 13, label = "Label").apply {
                 placeholder = "place"
                 name = "name"
@@ -59,7 +59,7 @@ class SpinnerSpec : DomSpec {
     @Test
     fun spinUp() {
         run {
-            val root = Root("test", true)
+            val root = Root("test", fixed = true)
             val si = Spinner(value = 13)
             root.add(si)
             assertEquals(13, si.value, "Should return initial value before spinUp")
@@ -71,7 +71,7 @@ class SpinnerSpec : DomSpec {
     @Test
     fun spinDown() {
         run {
-            val root = Root("test", true)
+            val root = Root("test", fixed = true)
             val si = Spinner(value = 13)
             root.add(si)
             assertEquals(13, si.value, "Should return initial value before spinDown")