summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-10-21 14:17:18 (GMT)
committerMontel Laurent <montel@kde.org>2016-10-21 14:17:18 (GMT)
commit6c2feb62387b8f2ec3bffee47e01188da4f6ae90 (patch)
treedbd52001c8e71705f9cf94eb22ca49d0a1ace806
parente8287a0ce253adfe70e4850cb10f3e10cb78d833 (diff)
Now we don't skip autotest
-rw-r--r--messagecomposer/autotests/CMakeLists.txt1
-rw-r--r--messagecomposer/autotests/messagefactorytest.cpp4
2 files changed, 1 insertions, 4 deletions
diff --git a/messagecomposer/autotests/CMakeLists.txt b/messagecomposer/autotests/CMakeLists.txt
index 9dcf2ec..496b21e 100644
--- a/messagecomposer/autotests/CMakeLists.txt
+++ b/messagecomposer/autotests/CMakeLists.txt
@@ -22,7 +22,6 @@ macro( add_messagecomposer_cryptotest _source )
KF5::MessageComposer
KF5::MessageViewer
KF5::MessageCore
- KF5::TemplateParser
KF5::Libkleo
KF5::Libkdepim
KF5::PimTextEdit
diff --git a/messagecomposer/autotests/messagefactorytest.cpp b/messagecomposer/autotests/messagefactorytest.cpp
index eaa5e79..940db13 100644
--- a/messagecomposer/autotests/messagefactorytest.cpp
+++ b/messagecomposer/autotests/messagefactorytest.cpp
@@ -21,7 +21,6 @@
#include "messagefactorytest.h"
#include "cryptofunctions.h"
-#include "globalsettings_templateparser.h"
#include <MessageCore/StringUtil>
#include <MessageCore/NodeHelper>
@@ -493,8 +492,7 @@ void MessageFactoryTest::test_multipartAlternative()
MessageFactory::MessageReply reply = factory.createReply();
reply.replyAll = true;
- QSKIP("This tests has been failing for a long time, please someone fix it", SkipSingle);
- QCOMPARE(reply.msg->contentType()->mimeType(), QStringLiteral("multipart/alternative"));
+ QCOMPARE(reply.msg->contentType()->mimeType(), QByteArrayLiteral("multipart/alternative"));
QCOMPARE(reply.msg->subject()->asUnicodeString(), QLatin1String("Re: Plain Message Test"));
QCOMPARE(reply.msg->contents().at(contentAt)->encodedBody().data(), expected.toLatin1().data());
delete identMan;