From 2d79643e1f0885315648c461a336a1f47f7f57b4 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Wed, 16 May 2018 09:55:36 +0200
Subject: [PATCH] mail_digest: fwd port improvements from v10

---
 mail_digest/controllers/digest_layout_preview.py |  1 -
 mail_digest/templates/digest_default.xml         |  2 +-
 mail_digest/tests/test_digest.py                 | 16 ++++++++--------
 mail_digest/tests/test_preview.py                |  7 ++++++-
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/mail_digest/controllers/digest_layout_preview.py b/mail_digest/controllers/digest_layout_preview.py
index 2766a52b..b205857a 100644
--- a/mail_digest/controllers/digest_layout_preview.py
+++ b/mail_digest/controllers/digest_layout_preview.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2018 Simone Orsi <simone.orsi@camptocamp.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
diff --git a/mail_digest/templates/digest_default.xml b/mail_digest/templates/digest_default.xml
index 66c10f66..409c4690 100644
--- a/mail_digest/templates/digest_default.xml
+++ b/mail_digest/templates/digest_default.xml
@@ -24,7 +24,7 @@
     <template id="default_digest_tmpl" name="Mail digest default template">
         <t t-call="mail_digest.digest_layout">
             <div id="mail_content">
-                <p>Hello <t t-esc="digest.partner_id.name" />,</p>
+                <p>Hello <t t-esc="digest.user_id.name" />,</p>
                 <div id="mail_inner_content">
                     <t t-foreach="grouped_messages.keys()" t-as="gkey">
                         <t t-set="messages" t-value="grouped_messages[gkey]" />
diff --git a/mail_digest/tests/test_digest.py b/mail_digest/tests/test_digest.py
index c760841a..76f2af07 100644
--- a/mail_digest/tests/test_digest.py
+++ b/mail_digest/tests/test_digest.py
@@ -194,26 +194,26 @@ class DigestCase(SavepointCase):
             dig._get_email_values()
 
     def test_digest_message_body_sanitize(self):
-        dig = self._create_for_partner(self.partner1)
+        dig = self._create_for_partner(self.user1.partner_id)
         message = self.message_model.create({
-            'body': '<p style="font-weight:bold">Body!</p>',
+            'body': '<p style="font-weight: bold">Body!</p>',
             'subtype_id': self.subtype1.id,
-            'res_id': self.partner3.id,
+            'res_id': self.user3.partner_id.id,
             'model': 'res.partner',
-            'partner_ids': [(4, self.partner1.id)]
+            'partner_ids': [(4, self.user1.partner_id.id)]
         })
         body = dig.message_body(message)
         self.assertEqual(body, '<p>Body!</p>')
 
     def test_digest_message_body_no_sanitize(self):
-        dig = self._create_for_partner(self.partner1)
+        dig = self._create_for_partner(self.user1.partner_id)
         dig.sanitize_msg_body = False
         message = self.message_model.create({
-            'body': '<p style="font-weight:bold">Body!</p>',
+            'body': '<p style="font-weight: bold">Body!</p>',
             'subtype_id': self.subtype1.id,
-            'res_id': self.partner3.id,
+            'res_id': self.user3.partner_id.id,
             'model': 'res.partner',
-            'partner_ids': [(4, self.partner1.id)]
+            'partner_ids': [(4, self.user1.partner_id.id)]
         })
         body = dig.message_body(message)
         self.assertEqual(
diff --git a/mail_digest/tests/test_preview.py b/mail_digest/tests/test_preview.py
index 6f2f824a..32926d06 100644
--- a/mail_digest/tests/test_preview.py
+++ b/mail_digest/tests/test_preview.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2017 Simone Orsi <simone.orsi@camptocamp.com>
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 
@@ -55,3 +54,9 @@ class PreviewCase(SavepointCase):
         patched_req.env = self.env
         vals = self.ctrl._fake_tracking_vals()
         self.assertEqual(len(vals), 2)
+
+    @mock.patch(REQUEST_PATH + '.request')
+    def test_render(self, patched_req):
+        patched_req.env = self.env
+        html = self.ctrl.digest_test()
+        self.assertTrue(html)