Changeset - cbfc29a4c363
[Not reviewed]
default
0 2 0
Thomas De Schampheleire - 8 years ago 2018-02-12 09:29:01
thomas.de_schampheleire@nokia.com
email templates: add HTML entities to test strings

An issue is observed in Outlook rendering of HTML emails, where the HTML
entity ' is not recognized and seen as a literal string.

Add some HTML entities to the test strings to be able to see the issue
(after mailing the resulting HTML to an Outlook client)
2 files changed with 17 insertions and 17 deletions:
0 comments (0 inline, 0 general)
kallithea/tests/models/test_dump_html_mails.ref.html
Show inline comments
 
@@ -17,7 +17,7 @@ Comment on Changeset "This changeset did
 

	
 
Opinionated User (jsmith):
 

	
 
This is the new comment.
 
This is the new 'comment'.
 

	
 
 - and here it ends indented.
 

	
 
@@ -94,7 +94,7 @@ View Comment: http://comment.org
 
    <tr>
 
        <td width="20px" style="width:20px"></td>
 
        <td>
 
            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.<br/><br/> - and here it ends indented.</div></div>
 
            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new &apos;comment&apos;.<br/><br/> - and here it ends indented.</div></div>
 
        </td>
 
        <td width="20px" style="width:20px"></td>
 
    </tr>
 
@@ -176,7 +176,7 @@ Mention in Comment on Changeset "This ch
 

	
 
Opinionated User (jsmith):
 

	
 
This is the new comment.
 
This is the new 'comment'.
 

	
 
 - and here it ends indented.
 

	
 
@@ -253,7 +253,7 @@ View Comment: http://comment.org
 
    <tr>
 
        <td width="20px" style="width:20px"></td>
 
        <td>
 
            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.<br/><br/> - and here it ends indented.</div></div>
 
            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new &apos;comment&apos;.<br/><br/> - and here it ends indented.</div></div>
 
        </td>
 
        <td width="20px" style="width:20px"></td>
 
    </tr>
 
@@ -337,7 +337,7 @@ Opinionated User (jsmith):
 

	
 
Status change: Approved
 

	
 
This is the new comment.
 
This is the new 'comment'.
 

	
 
 - and here it ends indented.
 

	
 
@@ -430,7 +430,7 @@ View Comment: http://comment.org
 
    <tr>
 
        <td width="20px" style="width:20px"></td>
 
        <td>
 
            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.<br/><br/> - and here it ends indented.</div></div>
 
            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new &apos;comment&apos;.<br/><br/> - and here it ends indented.</div></div>
 
        </td>
 
        <td width="20px" style="width:20px"></td>
 
    </tr>
 
@@ -514,7 +514,7 @@ Opinionated User (jsmith):
 

	
 
Status change: Approved
 

	
 
This is the new comment.
 
This is the new 'comment'.
 

	
 
 - and here it ends indented.
 

	
 
@@ -607,7 +607,7 @@ View Comment: http://comment.org
 
    <tr>
 
        <td width="20px" style="width:20px"></td>
 
        <td>
 
            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.<br/><br/> - and here it ends indented.</div></div>
 
            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new &apos;comment&apos;.<br/><br/> - and here it ends indented.</div></div>
 
        </td>
 
        <td width="20px" style="width:20px"></td>
 
    </tr>
 
@@ -682,7 +682,7 @@ To: u2@example.com
 
Subject: Test Message
 
</pre>
 
<hr/>
 
<pre>This is the body of the test message
 
<pre>This is the 'body' of the "test" message
 
 - nothing interesting here except indentation.</pre>
 
<hr/>
 
<!--!doctype html-->
 
@@ -728,7 +728,7 @@ Subject: Test Message
 
                    <td>
 
<table cellpadding="0" cellspacing="0" border="0" width="100%">
 
    <tr>
 
        <td style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the body of the test message<br/> - nothing interesting here except indentation.</div></td>
 
        <td style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the &apos;body&apos; of the &quot;test&quot; message<br/> - nothing interesting here except indentation.</div></td>
 
    </tr>
 
</table>
 
                    </td>
 
@@ -897,7 +897,7 @@ Pull request from https://dev.org/repo a
 

	
 
Description:
 

	
 
This PR is awesome because it does stuff
 
This PR is 'awesome' because it does <stuff>
 
 - please approve indented!
 

	
 

	
 
@@ -987,7 +987,7 @@ View Pull Request: http://pr.org/7
 
    <tr><td height="10px" style="height:10px"></td></tr>
 
    <tr>
 
        <td>
 
            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap;color:#395fa0"><div class="formatted-fixed">This PR is awesome because it does stuff<br/> - please approve indented!</div></div>
 
            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap;color:#395fa0"><div class="formatted-fixed">This PR is &apos;awesome&apos; because it does &lt;stuff&gt;<br/> - please approve indented!</div></div>
 
        </td>
 
    </tr>
 
    <tr><td height="15px" style="height:15px"></td></tr>
 
@@ -1072,7 +1072,7 @@ Pull request from https://dev.org/repo a
 

	
 
Description:
 

	
 
This PR is awesome because it does stuff
 
This PR is 'awesome' because it does <stuff>
 
 - please approve indented!
 

	
 

	
 
@@ -1162,7 +1162,7 @@ View Pull Request: http://pr.org/7
 
    <tr><td height="10px" style="height:10px"></td></tr>
 
    <tr>
 
        <td>
 
            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap;color:#395fa0"><div class="formatted-fixed">This PR is awesome because it does stuff<br/> - please approve indented!</div></div>
 
            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap;color:#395fa0"><div class="formatted-fixed">This PR is &apos;awesome&apos; because it does &lt;stuff&gt;<br/> - please approve indented!</div></div>
 
        </td>
 
    </tr>
 
    <tr><td height="15px" style="height:15px"></td></tr>
kallithea/tests/models/test_notifications.py
Show inline comments
 
@@ -209,7 +209,7 @@ class TestNotifications(TestController):
 

	
 
                for type_, body, kwargs in [
 
                    (Notification.TYPE_CHANGESET_COMMENT,
 
                     u'This is the new comment.\n\n - and here it ends indented.',
 
                     u'This is the new \'comment\'.\n\n - and here it ends indented.',
 
                     dict(
 
                        short_id='cafe1234',
 
                        raw_id='cafe1234c0ffeecafe',
 
@@ -224,7 +224,7 @@ class TestNotifications(TestController):
 
                        cs_url='http://changeset.com',
 
                        cs_author=User.get(self.u2))),
 
                    (Notification.TYPE_MESSAGE,
 
                     u'This is the body of the test message\n - nothing interesting here except indentation.',
 
                     u'This is the \'body\' of the "test" message\n - nothing interesting here except indentation.',
 
                     dict()),
 
                    #(Notification.TYPE_MENTION, '$body', None), # not used
 
                    (Notification.TYPE_REGISTRATION,
 
@@ -235,7 +235,7 @@ class TestNotifications(TestController):
 
                        new_email='new@email.com',
 
                        new_full_name='New Full Name')),
 
                    (Notification.TYPE_PULL_REQUEST,
 
                     u'This PR is awesome because it does stuff\n - please approve indented!',
 
                     u'This PR is \'awesome\' because it does <stuff>\n - please approve indented!',
 
                     dict(
 
                        pr_user_created='Requesting User (root)', # pr_owner should perhaps be used for @mention in description ...
 
                        is_mention=[False, True],
0 comments (0 inline, 0 general)