notifications: adjusting how instance name is passed and fixing tests

rhodecode/model/notification.py

@@ -327,7 +327,8 b' class EmailNotificationModel(BaseModel):'
         :return:
         """
         _kwargs = {
-            'instance_url': h.url('home', qualified=True)
+            'instance_url': h.url('home', qualified=True),
+            'rhodecode_instance_name': getattr(c, 'rhodecode_name', '')
         }
         _kwargs.update(kwargs)
         return _kwargs

rhodecode/templates/email_templates/base.mako

@@ -88,8 +88,8 b''
                 <tr><td style="width:100%;padding:7px;background-color:#202020" valign="top">
                     <a style="width:100%;height:100%;display:block;color:#eeeeee;text-decoration:none;" href="${instance_url}">
                         ${_('RhodeCode')}
-                        % if c.rhodecode_name:
-                            - ${c.rhodecode_name}
+                        % if rhodecode_instance_name:
+                            - ${rhodecode_instance_name}
                         % endif
                     </a>
                 </td></tr>

rhodecode/tests/lib/test_mako_emails.py

@@ -27,9 +27,9 b' def test_render_email(pylonsapp):'
     assert body_plaintext == 'Email Plaintext Body'
 
     # body
-    assert '<b>This is a notification ' \
-           'from RhodeCode. http://test.example.com:80/</b>' in body
-    assert '<b>Email Body' in body
+    assert 'This is a notification ' \
+           'from RhodeCode. http://test.example.com:80/' in body
+    assert 'Email Body' in body
 
 
 def test_render_pr_email(pylonsapp, user_admin):