summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2018-07-31 12:25:12 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2018-07-31 12:25:12 +0200
commitab2b00093e1a40fc8dabd2c95b4bbd576e88e953 (patch)
tree3275ed7779739a9e52067b160a093d5efa5f2b87
parent1745daa581b2ea70169eacfaad5480c823de2c30 (diff)
downloadkube-ab2b00093e1a40fc8dabd2c95b4bbd576e88e953.tar.gz
kube-ab2b00093e1a40fc8dabd2c95b4bbd576e88e953.zip
Fixed replies
We accidentally ended up stripping newlines
-rw-r--r--framework/qml/TextEditor.qml2
-rw-r--r--views/composer/tests/tst_composerview.qml8
2 files changed, 7 insertions, 3 deletions
diff --git a/framework/qml/TextEditor.qml b/framework/qml/TextEditor.qml
index 45bf2ecd..7dd30625 100644
--- a/framework/qml/TextEditor.qml
+++ b/framework/qml/TextEditor.qml
@@ -96,7 +96,7 @@ FocusScope {
96 focus: true 96 focus: true
97 selectByMouse: true 97 selectByMouse: true
98 wrapMode: TextEdit.Wrap 98 wrapMode: TextEdit.Wrap
99 textFormat: Qt.RichText 99 textFormat: Qt.AutoText
100 onCursorRectangleChanged: flickableItem.ensureVisible(cursorRectangle) 100 onCursorRectangleChanged: flickableItem.ensureVisible(cursorRectangle)
101 101
102 color: Kube.Colors.textColor 102 color: Kube.Colors.textColor
diff --git a/views/composer/tests/tst_composerview.qml b/views/composer/tests/tst_composerview.qml
index d3b6a420..74a62630 100644
--- a/views/composer/tests/tst_composerview.qml
+++ b/views/composer/tests/tst_composerview.qml
@@ -119,7 +119,7 @@ ViewTestCase {
119 mails:[{ 119 mails:[{
120 resource: "resource1", 120 resource: "resource1",
121 subject: "subject", 121 subject: "subject",
122 body: "body", 122 body: "body\nnewline",
123 to: ["to@example.org"], 123 to: ["to@example.org"],
124 cc: ["cc@example.org"], 124 cc: ["cc@example.org"],
125 bcc: ["bcc@example.org"], 125 bcc: ["bcc@example.org"],
@@ -134,7 +134,11 @@ ViewTestCase {
134 var subject = findChild(composer, "subject"); 134 var subject = findChild(composer, "subject");
135 verify(subject) 135 verify(subject)
136 tryVerify(function(){ return subject.text == "RE: subject" }) 136 tryVerify(function(){ return subject.text == "RE: subject" })
137 tryVerify(function(){ return subject.body != "" }) 137
138 var textEditor = findChild(composer, "textEditor");
139 verify(textEditor)
140 var expectedText = "you wrote:\n> body\n> newline"
141 tryVerify(function(){ return textEditor.text.match(expectedText) })
138 } 142 }
139 143
140 function test_5loadHtmlDraft() { 144 function test_5loadHtmlDraft() {