[2/49] git commit: [#5349] ticket:226 converted markdown to html in rss feed

[br...@apache.org]

[#5349] ticket:226 converted markdown to html in rss feed


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/cef0677f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/cef0677f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/cef0677f

Branch: refs/heads/db/4803
Commit: cef0677fcad68234caa8efe02a38d54ecef75596
Parents: 5633202
Author: Yuriy Arhipov <yu...@yandex.ru>
Authored: Wed Dec 5 16:19:16 2012 +0400
Committer: Dave Brondsema <db...@geek.net>
Committed: Fri Dec 7 20:21:25 2012 +0000

----------------------------------------------------------------------
 Allura/allura/model/artifact.py                    |    4 ++--
 Allura/allura/tests/functional/test_feeds.py       |    2 +-
 ForgeBlog/forgeblog/tests/functional/test_root.py  |    4 ++++
 .../forgetracker/tests/unit/test_ticket_model.py   |    2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/cef0677f/Allura/allura/model/artifact.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/artifact.py b/Allura/allura/model/artifact.py
index 219b52b..6ee27bf 100644
--- a/Allura/allura/model/artifact.py
+++ b/Allura/allura/model/artifact.py
@@ -5,7 +5,7 @@ from datetime import datetime
 
 import bson
 import pymongo
-from pylons import c, request
+from pylons import c, request, g
 from ming import schema as S
 from ming.orm import state, session
 from ming.orm import FieldProperty, ForeignIdProperty, RelationProperty
@@ -654,7 +654,7 @@ class Feed(MappedClass):
             app_config_id=artifact.app_config_id,
             tool_name=artifact.app_config.tool_name,
             title=title,
-            description=description,
+            description=g.markdown.convert(description),
             link=link,
             pubdate=pubdate,
             author_name=author_name,

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/cef0677f/Allura/allura/tests/functional/test_feeds.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_feeds.py b/Allura/allura/tests/functional/test_feeds.py
index 57a9dbe..5e7136a 100644
--- a/Allura/allura/tests/functional/test_feeds.py
+++ b/Allura/allura/tests/functional/test_feeds.py
@@ -75,6 +75,6 @@ class TestFeeds(TestController):
                 milestone='',
                 description='This is another description'), extra_environ=dict(username='root'))
         r = self.app.get('/bugs/1/feed.atom')
-        assert '=&gt;' in r
+        assert '=&amp;gt' in r
         assert '\n+' in r
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/cef0677f/ForgeBlog/forgeblog/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/tests/functional/test_root.py b/ForgeBlog/forgeblog/tests/functional/test_root.py
index 2ac22fe..84520f7 100644
--- a/ForgeBlog/forgeblog/tests/functional/test_root.py
+++ b/ForgeBlog/forgeblog/tests/functional/test_root.py
@@ -182,6 +182,10 @@ class TestRootController(TestController):
         assert 'Nothing to see' in response
         response = self.app.get('/blog/%s/my-post/feed.atom' % d)
         assert 'Nothing to see' in response
+        self._post(title='test', text='*sometext*')
+        response = self.app.get('/blog/feed')
+        assert '&lt;div class="markdown_content"&gt;&lt;p&gt;&lt;em&gt;sometext&lt;/em&gt;&lt;/p&gt;&lt;/div&gt;' in response
+
 
     def test_related_artifacts(self):
         self._post(title='one')

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/cef0677f/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py b/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
index 0bc9e5d..670236b 100644
--- a/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
+++ b/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
@@ -128,4 +128,4 @@ class TestTicketModel(TrackerTestWithModel):
             pubdate=t.created_date)
         assert_equal(f.pubdate, datetime(2012, 10, 29, 9, 57, 21, 465000))
         assert_equal(f.title, 'test ticket')
-        assert_equal(f.description, 'test description')
+        assert_equal(f.description, '<div class="markdown_content"><p>test description</p></div>')