Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/captcha.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/captcha.py	(revision 7299)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/captcha.py	(revision 7300)
@@ -188,8 +188,6 @@
 ## TestCaptcha
 ##
-class IdCaptcha(object):
-    """The IdCaptcha allows all solutions that equal a challenge.
-
-    The challenge is a permutation of 'abcdefg'.
+class StaticCaptcha(object):
+    """The StaticCaptcha always has the same solution: 'the-solution'.
 
     It is of no use for real world but for tests. In tests we cannot
@@ -197,6 +195,10 @@
     works like a real one but is easy to solve even for machines.
 
-    It is called IdCaptcha because solutions and challenges for this
-    captcha type are mapped by identitiy function.
+    The HTML form piece generated is even prefilled with the correct
+    solution. So in tests it is not necessary to always 'type' the
+    solution string in the correct field.
+
+    You can, however, fill in a wrong solution and it will be detected
+    as such.
     """
     grok.implements(ICaptcha)
@@ -220,16 +222,13 @@
         """Display challenge and input field for solution as HTML.
         """
-        challenge = list('abcdef')
-        random().shuffle(challenge)
-        challenge = ''.join(challenge)
         html = (
             u'<input type="hidden" name="challenge"'
-            u'       value="%s" /><br />'
+            u'       value="the-solution" /><br />'
             u'Type: %s<br />'
-            u'<input type="text" name="solution" /><br />' % (
-                challenge, challenge))
+            u'<input type="text" name="solution" value="the-solution"'
+            u' /><br />')
         return html
 
-grok.global_utility(IdCaptcha, name=u'Testing captcha')
+grok.global_utility(StaticCaptcha, name=u'Testing captcha')
 
 
