changeset 2831:8f21cc746e81

merged main
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Tue, 11 Sep 2007 18:16:12 +0200
parents c4ab7c81146d (current diff) 1c49db715499 (diff)
children bda6fe7c015b
files
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/_tests/test_user.py	Tue Sep 11 18:15:44 2007 +0200
+++ b/MoinMoin/_tests/test_user.py	Tue Sep 11 18:16:12 2007 +0200
@@ -145,7 +145,7 @@
         # Login - this should replace the old password in the user file
         theUser = user.User(self.request, name=name, password=password)
         theUser.subscribe(pagename)
-       assert theUser.isSubscribedTo([pagename]) # list(!) of pages to check
+        assert theUser.isSubscribedTo([pagename]) # list(!) of pages to check
 
     def testSubscriptionSubPage(self):
         """ user: tests isSubscribedTo on a subpage """
@@ -157,7 +157,7 @@
         # Login - this should replace the old password in the user file
         theUser = user.User(self.request, name=name, password=password)
         theUser.subscribe(pagename)
-       assert not theUser.isSubscribedTo([testPagename]) # list(!) of pages to check
+        assert not theUser.isSubscribedTo([testPagename]) # list(!) of pages to check
 
     # Helpers ---------------------------------------------------------
 
--- a/MoinMoin/script/migration/_tests/test_conv160_wiki.py	Tue Sep 11 18:15:44 2007 +0200
+++ b/MoinMoin/script/migration/_tests/test_conv160_wiki.py	Tue Sep 11 18:16:12 2007 +0200
@@ -111,13 +111,15 @@
             # macros
             ('[[BR]]', {}, '<<BR>>'),
             ('[[FullSearch(wtf)]]', {}, '<<FullSearch(wtf)>>'),
-            ('[[ImageLink(test.png)]]', {}, '[[attachment:test.png|{{attachment:test.png}}]]'),
+            (u'[[ImageLink(töst.png)]]', {}, u'[[attachment:töst.png|{{attachment:töst.png}}]]'),
             ('[[ImageLink(test.png,OtherPage)]]', {}, '[[OtherPage|{{attachment:test.png}}]]'),
             ('[[ImageLink(test.png,OtherPage,width=123,height=456)]]', {}, '[[OtherPage|{{attachment:test.png||width=123, height=456}}]]'),
             ('[[ImageLink(test.png,OtherPage,width=123,height=456,alt=alttext)]]', {}, '[[OtherPage|{{attachment:test.png|alttext|width=123, height=456}}]]'),
             ('[[ImageLink(test.png,OtherPage,width=123,height=456,alt=alt text with blanks)]]', {}, '[[OtherPage|{{attachment:test.png|alt text with blanks|width=123, height=456}}]]'),
             ('[[ImageLink(http://server/test.png,OtherPage,width=123,height=456)]]', {}, '[[OtherPage|{{http://server/test.png||width=123, height=456}}]]'),
             ('[[ImageLink(http://server/test.png,http://server/,width=123)]]', {}, '[[http://server/|{{http://server/test.png||width=123}}]]'),
+            ('[[ImageLink(test.png,attachment:test.png)]]', {}, '[[attachment:test.png|{{attachment:test.png}}]]'),
+            ('[[ImageLink(test.png,inline:test.py)]]', {}, '[[attachment:test.py|{{attachment:test.png}}]]'),
 
         ]
         for data, renames, expected in tests: