Release 2.1.2, merged in 1368 to HEAD.

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/branches/strict@1404 48356398-32a2-884e-a903-53898d9a118a

tests/HTMLPurifier/Injector/LinkifyTest.php

@@ -8,35 +8,40 @@ class HTMLPurifier_Injector_LinkifyTest extends HTMLPurifier_InjectorHarness
     
     function setup() {
         parent::setup();
-        $this->config = array('AutoFormat.Linkify' => true);
+        $this->config->set('AutoFormat', 'Linkify', true);
     }
     
-    function testLinkify() {
-        
+    function testLinkifyURLInRootNode() {
         $this->assertResult(
             'http://example.com',
             '<a href="http://example.com">http://example.com</a>'
         );
-        
+    }
+    
+    function testLinkifyURLInInlineNode() {
         $this->assertResult(
             '<b>http://example.com</b>',
             '<b><a href="http://example.com">http://example.com</a></b>'
         );
-        
+    }
+    
+    function testBasicUsageCase() {
         $this->assertResult(
             'This URL http://example.com is what you need',
             'This URL <a href="http://example.com">http://example.com</a> is what you need'
         );
-        
+    }
+    
+    function testIgnoreURLInATag() {
         $this->assertResult(
             '<a>http://example.com/</a>'
         );
-        
     }
     
     function testNeeded() {
+        $this->config->set('HTML', 'Allowed', 'b');
         $this->expectError('Cannot enable Linkify injector because a is not allowed');
-        $this->assertResult('http://example.com/', true, array('AutoFormat.Linkify' => true, 'HTML.Allowed' => 'b'));
+        $this->assertResult('http://example.com/');
     }
     
 }