Skip to content

Commit b125cb5

Browse files
authored
Fixed #187 -- Restored support for restructuredtext on wiki pages.
The docutils dependency was removed by mistake in d9356b4.
1 parent 21bc47f commit b125cb5

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

.TRACFREEZE.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ trac.mimeview.api.plaintextrenderer
2222
trac.mimeview.api.wikitextrenderer
2323
trac.mimeview.patch.patchrenderer
2424
trac.mimeview.pygments.pygmentsrenderer
25+
trac.mimeview.rst.restructuredtextrenderer
2526
trac.notification.api.notificationsystem
2627
trac.notification.mail.alwaysemailsubscriber
2728
trac.notification.mail.emaildistributor

DjangoPlugin/tracdjangoplugin/tests.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
from django.contrib.auth.models import User
88
from django.test import SimpleTestCase, TestCase
99

10+
from trac.mimeview.api import Mimeview
11+
from trac.mimeview.rst import (
12+
ReStructuredTextRenderer, # noqa: needed for RSTUncycloTestCase to work
13+
)
1014
from trac.test import EnvironmentStub, MockRequest
1115
from trac.web.api import RequestDone
1216

@@ -228,3 +232,15 @@ def test_anonymous_goes_through(self):
228232
handler = object()
229233
retval = self.component.pre_process_request(request, handler=handler)
230234
self.assertIs(retval, handler)
235+
236+
237+
class RSTUncycloTestCase(SimpleTestCase):
238+
def test_wiki_can_render_rst(self):
239+
renderer = Mimeview(EnvironmentStub())
240+
output = renderer.render(
241+
content="====\nTEST\n====\n", mimetype="text/x-rst", context=None
242+
)
243+
self.assertHTMLEqual(
244+
str(output),
245+
'<div class="document" id="test"><h1 class="title">TEST</h1></div>',
246+
)

requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# spam-filter doesn't work without babel (but somehow doesn't list it in its requirements)
2-
Trac[pygments, babel]==1.6.0
2+
# rest is needed to support wiki pages written in rst
3+
Trac[babel, pygments, rest]==1.6.0
34
psycopg2==2.9.9 --no-binary=psycopg2
45
Django==3.2.25
56
libsass==0.23.0

0 commit comments

Comments
 (0)