incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [4/8] git commit: [#4667] ticket:183 fix tests
Date Wed, 07 Nov 2012 21:00:48 GMT
[#4667] ticket:183 fix tests


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

Branch: refs/heads/master
Commit: 5bb0111097ea67041e4f169e81a8c09dd1325bde
Parents: e432872
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Tue Oct 9 11:45:52 2012 +0300
Committer: Dave Brondsema <dbrondsema@geek.net>
Committed: Wed Nov 7 20:30:57 2012 +0000

----------------------------------------------------------------------
 Allura/allura/lib/markdown_extensions.py    |    2 +-
 Allura/allura/tests/functional/test_root.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5bb01110/Allura/allura/lib/markdown_extensions.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/markdown_extensions.py b/Allura/allura/lib/markdown_extensions.py
index 68741ca..96a495d 100644
--- a/Allura/allura/lib/markdown_extensions.py
+++ b/Allura/allura/lib/markdown_extensions.py
@@ -101,7 +101,7 @@ class ForgeLinkPattern(markdown.inlinepatterns.LinkPattern):
         if shortlink:
             href = shortlink.url
             classes = 'alink'
-            self.ext.forge_link_tree_processor.alinks.append(link)
+            self.ext.forge_link_tree_processor.alinks.append(shortlink)
         elif self.ext._use_wiki and ':' not in link:
             href = h.urlquote(link)
             classes = 'notfound alink'

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5bb01110/Allura/allura/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_root.py b/Allura/allura/tests/functional/test_root.py
index 4200328..995be0d 100644
--- a/Allura/allura/tests/functional/test_root.py
+++ b/Allura/allura/tests/functional/test_root.py
@@ -123,7 +123,7 @@ class TestRootController(TestController):
     def test_markdown_to_html(self):
         n = M.Neighborhood.query.get(name='Projects')
         r = self.app.get('/nf/markdown_to_html?markdown=*aaa*bb[wiki:Home]&project=test&app=bugs&neighborhood=%s'
% n._id, validate_chunk=True)
-        assert '<p><em>aaa</em>bb<a href="/p/test/wiki/Home/">[wiki:Home]</a></p>'
in r, r
+        assert '<p><em>aaa</em>bb<a class="alink" href="/p/test/wiki/Home/">[wiki:Home]</a></p>'
in r, r
 
     def test_slash_redirect(self):
         r = self.app.get('/p',status=301)


Mime
View raw message