# HG changeset patch # User Ludovic Chabant # Date 1442785208 25200 # Node ID 666a9d0981bbe5cdee34f7ef8568cc9e4d092ec8 # Parent 75bcfb3b37b6ce17e7c70ffeec0919d48028dc6c Quick fixes for the unit tests. diff -r 75bcfb3b37b6 -r 666a9d0981bb tests/__init__.py --- a/tests/__init__.py Sun Sep 20 08:27:54 2015 -0700 +++ b/tests/__init__.py Sun Sep 20 14:40:08 2015 -0700 @@ -72,6 +72,7 @@ res += '\" data-wiki-url=\"' + url + '\"' if mod: res += ' data-wiki-mod=\"' + mod + '\"' + res += ' href="/read' + url + '"' res += '>' + title + '' return res diff -r 75bcfb3b37b6 -r 666a9d0981bb tests/test_page.py --- a/tests/test_page.py Sun Sep 20 08:27:54 2015 -0700 +++ b/tests/test_page.py Sun Sep 20 14:40:08 2015 -0700 @@ -86,17 +86,17 @@ def testGenericUrl(self): wiki = self._getWikiFromStructure({ - '/foo.txt': "URL: [[blah|url:/blah/boo/raw.txt]]" + '/foo.txt': "URL: [[url:/blah/boo/raw.txt]]" }) foo = wiki.getPage('/foo') - self.assertEqual("URL: blah", foo.getFormattedText()) + self.assertEqual("URL: /files/blah/boo/raw.txt", foo.getFormattedText()) def testImageUrl(self): wiki = self._getWikiFromStructure({ '/foo.txt': "URL: [[blah|asset:/blah/boo/image.png]]" }) foo = wiki.getPage('/foo') - self.assertEqual("URL: \"blah\"", foo.getFormattedText()) + self.assertEqual("URL: \"blah\"", foo.getFormattedText()) def testUrlTemplateFunctions(self): wiki =self._getWikiFromStructure({ @@ -104,6 +104,6 @@ }) foo = wiki.getPage('/foo') self.assertEqual( - 'Here is FOO!', + 'Here is FOO!', foo.text ) diff -r 75bcfb3b37b6 -r 666a9d0981bb tests/test_resolver.py --- a/tests/test_resolver.py Sun Sep 20 08:27:54 2015 -0700 +++ b/tests/test_resolver.py Sun Sep 20 14:40:08 2015 -0700 @@ -64,7 +64,7 @@ }) foo = wiki.getPage('/foo') self.assertEqual( - 'Hello here.\nHere is foo!', + 'Hello here.\nHere is foo!', foo.text )