Changeset - cbfc29a4c363
Parent rev.
Child rev.
[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:
kallithea/tests/models/test_dump_html_mails.ref.html
14
14
kallithea/tests/models/test_notifications.py
3
3
0 comments (0 inline, 0 general)
kallithea/tests/models/test_dump_html_mails.ref.html
➞
Show inline comments
 
@@ -14,13 +14,13 @@ Subject: [Comment] repo/name changeset c
 

			




	
	
	
		
 
Comment on Changeset "This changeset did something clever which is hard to explain"

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
Opinionated User (jsmith):

			




	
	
	
		
 

			




	
	
	
		
 
This is the new comment.

			




	
	
	
		
 
This is the new 'comment'.

			




	
	
	
		
 

			




	
	
	
		
 
 - and here it ends indented.

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
Changeset on http://example.com/repo_target branch brunch:

			




	
	
	
		
 
"This changeset did something clever which is hard to explain" by u2 u3 (u2).

			




	
	
		
 
@@ -91,13 +91,13 @@ View Comment: http://comment.org

			




	
	
	
		
 
    <tr>

			




	
	
	
		
 
        <td height="10px" style="height:10px" colspan="3"></td>

			




	
	
	
		
 
    </tr>

			




	
	
	
		
 
    <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>

			




	
	
	
		
 
    <tr>

			




	
	
	
		
 
        <td height="10px" style="height:10px" colspan="3"></td>

			




	
	
	
		
 
    </tr>

			




	
	
		
 
@@ -173,13 +173,13 @@ Subject: [Comment] repo/name changeset c

			




	
	
	
		
 

			




	
	
	
		
 
Mention in Comment on Changeset "This changeset did something clever which is hard to explain"

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
Opinionated User (jsmith):

			




	
	
	
		
 

			




	
	
	
		
 
This is the new comment.

			




	
	
	
		
 
This is the new 'comment'.

			




	
	
	
		
 

			




	
	
	
		
 
 - and here it ends indented.

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
Changeset on http://example.com/repo_target branch brunch:

			




	
	
	
		
 
"This changeset did something clever which is hard to explain" by u2 u3 (u2).

			




	
	
		
 
@@ -250,13 +250,13 @@ View Comment: http://comment.org

			




	
	
	
		
 
    <tr>

			




	
	
	
		
 
        <td height="10px" style="height:10px" colspan="3"></td>

			




	
	
	
		
 
    </tr>

			




	
	
	
		
 
    <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>

			




	
	
	
		
 
    <tr>

			




	
	
	
		
 
        <td height="10px" style="height:10px" colspan="3"></td>

			




	
	
	
		
 
    </tr>

			




	
	
		
 
@@ -334,13 +334,13 @@ Comment on Changeset "This changeset did

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
Opinionated User (jsmith):

			




	
	
	
		
 

			




	
	
	
		
 
Status change: Approved

			




	
	
	
		
 

			




	
	
	
		
 
This is the new comment.

			




	
	
	
		
 
This is the new 'comment'.

			




	
	
	
		
 

			




	
	
	
		
 
 - and here it ends indented.

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
Changeset on http://example.com/repo_target branch brunch:

			




	
	
	
		
 
"This changeset did something clever which is hard to explain" by u2 u3 (u2).

			




	
	
		
 
@@ -427,13 +427,13 @@ View Comment: http://comment.org

			




	
	
	
		
 
    <tr>

			




	
	
	
		
 
        <td height="10px" style="height:10px" colspan="3"></td>

			




	
	
	
		
 
    </tr>

			




	
	
	
		
 
    <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>

			




	
	
	
		
 
    <tr>

			




	
	
	
		
 
        <td height="10px" style="height:10px" colspan="3"></td>

			




	
	
	
		
 
    </tr>

			




	
	
		
 
@@ -511,13 +511,13 @@ Mention in Comment on Changeset "This ch

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
Opinionated User (jsmith):

			




	
	
	
		
 

			




	
	
	
		
 
Status change: Approved

			




	
	
	
		
 

			




	
	
	
		
 
This is the new comment.

			




	
	
	
		
 
This is the new 'comment'.

			




	
	
	
		
 

			




	
	
	
		
 
 - and here it ends indented.

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
Changeset on http://example.com/repo_target branch brunch:

			




	
	
	
		
 
"This changeset did something clever which is hard to explain" by u2 u3 (u2).

			




	
	
		
 
@@ -604,13 +604,13 @@ View Comment: http://comment.org

			




	
	
	
		
 
    <tr>

			




	
	
	
		
 
        <td height="10px" style="height:10px" colspan="3"></td>

			




	
	
	
		
 
    </tr>

			




	
	
	
		
 
    <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>

			




	
	
	
		
 
    <tr>

			




	
	
	
		
 
        <td height="10px" style="height:10px" colspan="3"></td>

			




	
	
	
		
 
    </tr>

			




	
	
		
 
@@ -679,13 +679,13 @@ View Comment: http://comment.org

			




	
	
	
		
 
<pre>

			




	
	
	
		
 
From: u1

			




	
	
	
		
 
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-->

			




	
	
	
		
 
<!--html lang="en"-->

			




	
	
	
		
 
<!--head-->

			




	
	
	
		
 
    <!--title--><!--/title-->

			




	
	
		
 
@@ -725,13 +725,13 @@ Subject: Test Message

			




	
	
	
		
 
                </tr>

			




	
	
	
		
 
                <tr>

			




	
	
	
		
 
                    <td></td>

			




	
	
	
		
 
                    <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>

			




	
	
	
		
 
                    <td></td>

			




	
	
	
		
 
                </tr>

			




	
	
	
		
 
                <tr>

			




	
	
		
 
@@ -894,13 +894,13 @@ Added as Reviewer of Pull Request #7 "Th

			




	
	
	
		
 
Pull request from https://dev.org/repo at devbranch to http://mainline.com/repo at trunk:

			




	
	
	
		
 
#7 "The Title" by u2 u3 (u2).

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
Description:

			




	
	
	
		
 

			




	
	
	
		
 
This PR is awesome because it does stuff

			




	
	
	
		
 
This PR is 'awesome' because it does <stuff>

			




	
	
	
		
 
 - please approve indented!

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
Changesets:

			




	
	
	
		
 

			




	
	
	
		
 
Introduce one and two

			




	
	
		
 
@@ -984,13 +984,13 @@ View Pull Request: http://pr.org/7

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
    </tr>

			




	
	
	
		
 
    <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>

			




	
	
	
		
 
    <tr>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            <div>Changesets:</div>

			




	
	
		
 
@@ -1069,13 +1069,13 @@ Mention on Pull Request #7 "The Title" b

			




	
	
	
		
 
Pull request from https://dev.org/repo at devbranch to http://mainline.com/repo at trunk:

			




	
	
	
		
 
#7 "The Title" by u2 u3 (u2).

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
Description:

			




	
	
	
		
 

			




	
	
	
		
 
This PR is awesome because it does stuff

			




	
	
	
		
 
This PR is 'awesome' because it does <stuff>

			




	
	
	
		
 
 - please approve indented!

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
Changesets:

			




	
	
	
		
 

			




	
	
	
		
 
Introduce one and two

			




	
	
		
 
@@ -1159,13 +1159,13 @@ View Pull Request: http://pr.org/7

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
    </tr>

			




	
	
	
		
 
    <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>

			




	
	
	
		
 
    <tr>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            <div>Changesets:</div>

			




        

    


    
    

    

        

                

                    kallithea/tests/models/test_notifications.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -206,13 +206,13 @@ class TestNotifications(TestController):

			




	
	
	
		
 
                    pr_owner=User.get(self.u2),

			




	
	
	
		
 
                    pr_owner_username='u2'

			




	
	
	
		
 
                    )

			




	
	
	
		
 

			




	
	
	
		
 
                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',

			




	
	
	
		
 
                        branch='brunch',

			




	
	
	
		
 
                        cs_comment_user='Opinionated User (jsmith)',

			




	
	
	
		
 
                        cs_comment_url='http://comment.org',

			




	
	
		
 
@@ -221,24 +221,24 @@ class TestNotifications(TestController):

			




	
	
	
		
 
                        message_short='This changeset did something cl...',

			




	
	
	
		
 
                        status_change=[None, 'Approved'],

			




	
	
	
		
 
                        cs_target_repo='http://example.com/repo_target',

			




	
	
	
		
 
                        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,

			




	
	
	
		
 
                     u'Registration body',

			




	
	
	
		
 
                     dict(

			




	
	
	
		
 
                        new_username='newbie',

			




	
	
	
		
 
                        registered_user_url='http://newbie.org',

			




	
	
	
		
 
                        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],

			




	
	
	
		
 
                        pr_revisions=[('123abc'*7, "Introduce one and two\n\nand that's it"), ('567fed'*7, 'Make one plus two equal tree')],

			




	
	
	
		
 
                        org_repo_name='repo_org',

			




	
	
	
		
 
                        **pr_kwargs)),

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.