From 352160bbf51795793530be0010d839398ef8b664 Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Fri, 19 May 2017 00:20:23 +0200
Subject: [PATCH] Fix autotest

---
 .../data/test-current-date-custom-ref.siv     | 26 ++++++++++++++-----
 .../autotests/data/test-date-ref.siv          |  1 +
 .../autotests/data/test-date.siv              |  1 +
 .../widgets/selectdatewidget.cpp              |  1 +
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/ksieveui/autocreatescripts/autotests/data/test-current-date-custom-ref.siv b/src/ksieveui/autocreatescripts/autotests/data/test-current-date-custom-ref.siv
index 9aa041ad..76f49ce4 100644
--- a/src/ksieveui/autocreatescripts/autotests/data/test-current-date-custom-ref.siv
+++ b/src/ksieveui/autocreatescripts/autotests/data/test-current-date-custom-ref.siv
@@ -1,11 +1,25 @@
-require ["variables","date","fileinto","mailbox"];
+require "date";
+require "variables";
+require "fileinto";
+require "mailbox";
 
+#SCRIPTNAME: Script part 0
 # Extract date info
-if currentdate :matches "year" "*" { set "year" "${1}"; }
-if currentdate :matches "month" "*" { set "month" "${1}"; }
+if currentdate :matches "year" "*"
+{
+    set "year" "${1}";
+} 
 
+#SCRIPTNAME: Script part 1
+if currentdate :matches "month" "*"
+{
+    set "month" "${1}";
+} 
+
+#SCRIPTNAME: Script part 2
 # Archive Dovecot mailing list items by year and month.
 # Create folder when it does not exist.
-if header :is "list-id" "dovecot.dovecot.org" {
-  fileinto :create "INBOX.Lists.${year}.${month}.dovecot";
-}
+if header :is "list-id" "dovecot.dovecot.org"
+{
+    fileinto :create "INBOX.Lists.${year}.${month}.dovecot";
+} 
\ No newline at end of file
diff --git a/src/ksieveui/autocreatescripts/autotests/data/test-date-ref.siv b/src/ksieveui/autocreatescripts/autotests/data/test-date-ref.siv
index f2016706..3f46166a 100644
--- a/src/ksieveui/autocreatescripts/autotests/data/test-date-ref.siv
+++ b/src/ksieveui/autocreatescripts/autotests/data/test-date-ref.siv
@@ -6,6 +6,7 @@ require "imap4flags";
 if allof (date :is "header" "day" "20"
 , not date :matches "header" "hour" "08"
 , not date :contains "header" "month" "08"
+, not date :contains "header" "weekday" "5"
 )
 {
     keep;
diff --git a/src/ksieveui/autocreatescripts/autotests/data/test-date.siv b/src/ksieveui/autocreatescripts/autotests/data/test-date.siv
index 14799d90..3e025e10 100644
--- a/src/ksieveui/autocreatescripts/autotests/data/test-date.siv
+++ b/src/ksieveui/autocreatescripts/autotests/data/test-date.siv
@@ -6,6 +6,7 @@ require "date";
 if allof (date :is "header" "day" "20"
 , not date :matches "header" "hour" "08"
 , not date :contains "header" "month" "8"
+, not date :contains "header" "weekday" "5"
 )
 {
     keep;
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectdatewidget.cpp b/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectdatewidget.cpp
index c64c87a3..2548d2a5 100644
--- a/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectdatewidget.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectdatewidget.cpp
@@ -270,6 +270,7 @@ void SelectDateWidget::setCode(const QString &type, const QString &value)
     case Weekday:
     case Year:
         mStackWidget->setCurrentWidget(mDateValue);
+        mDateValue->setType(dateType);
         mDateValue->setCode(value);
         break;
     case Date:
-- 
GitLab