5 files changed, 77 insertions, 1 deletions

diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt
index 431c1ac4..af456384 100644
--- a/framework/CMakeLists.txt
+++ b/framework/CMakeLists.txt
@@ -8,5 +8,6 @@ install(DIRECTORY qml/ DESTINATION ${FRAMEWORK_INSTALL_DIR})
 install(FILES qmldir DESTINATION ${FRAMEWORK_INSTALL_DIR})
 
 add_subdirectory(src)
+add_subdirectory(qml/tests)
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/framework/qml/TextEditor.qml b/framework/qml/TextEditor.qml
index 570bc322..609b85db 100644
--- a/framework/qml/TextEditor.qml
+++ b/framework/qml/TextEditor.qml
@@ -39,6 +39,19 @@ FocusScope {
         }
     }
 
+    onHtmlEnabledChanged: {
+        if (htmlEnabled) {
+            var t = document.htmlText
+            edit.textFormat = Qt.RichText
+            edit.text = t
+        } else {
+            var t = document.plainText
+            edit.textFormat = Qt.PlainText
+            edit.font.bold = false
+            edit.text = t
+        }
+    }
+
     Kube.DocumentHandler {
         id: document
         document: edit.textDocument
@@ -92,7 +105,6 @@ FocusScope {
                 focus: true
                 selectByMouse: true
                 wrapMode: TextEdit.WordWrap
-                textFormat: root.htmlEnabled ? Qt.RichText : Qt.PlainText
                 onCursorRectangleChanged: flickableItem.ensureVisible(cursorRectangle)
 
                 color: Kube.Colors.textColor
diff --git a/framework/qml/tests/CMakeLists.txt b/framework/qml/tests/CMakeLists.txt
new file mode 100644
index 00000000..bc34855c
--- /dev/null
+++ b/framework/qml/tests/CMakeLists.txt
@@ -0,0 +1,11 @@
+
+find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Quick QuickTest)
+
+add_executable(testrunner testrunner.cpp)
+target_link_libraries(testrunner
+    Qt5::Quick
+    Qt5::QuickTest
+)
+
+add_test(NAME frameworkqmltests COMMAND testrunner WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+
diff --git a/framework/qml/tests/testrunner.cpp b/framework/qml/tests/testrunner.cpp
new file mode 100644
index 00000000..c0bee01a
--- /dev/null
+++ b/framework/qml/tests/testrunner.cpp
@@ -0,0 +1,6 @@
+#include <QtQuickTest/quicktest.h>
+
+int main(int argc, char **argv)
+{
+    return quick_test_main(argc, argv, "example", 0);
+}
diff --git a/framework/qml/tests/tst_texteditor.qml b/framework/qml/tests/tst_texteditor.qml
new file mode 100644
index 00000000..21ebe642
--- /dev/null
+++ b/framework/qml/tests/tst_texteditor.qml
@@ -0,0 +1,46 @@
+/*
+ *   Copyright 2017 Christian Mollekopf <mollekopf@kolabsystems.com>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU Library General Public License as
+ *   published by the Free Software Foundation; either version 2, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU Library General Public License for more details
+ *
+ *   You should have received a copy of the GNU Library General Public
+ *   License along with this program; if not, write to the
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+import QtQuick 2.7
+import QtTest 1.0
+import org.kube.framework 1.0 as Kube
+
+
+TestCase {
+    id: testCase
+    width: 400
+    height: 400
+    name: "TextEditor"
+
+    Kube.TextEditor {
+        id: editor
+        initialText: "Foobar"
+        htmlEnabled: false
+    }
+
+    function test_1initialText() {
+        compare(editor.text, editor.initialText)
+    }
+
+    function test_2htmlConversion() {
+        editor.htmlEnabled = true
+        editor.htmlEnabled = false
+        compare(editor.text, editor.initialText)
+    }
+}