mirror of
https://github.com/ezyang/htmlpurifier.git
synced 2024-12-23 00:41:52 +00:00
[2.0.1] Rewire test-cases to swallow errors, not expect them
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1190 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
parent
bf0d659c47
commit
b10a380ff4
1
NEWS
1
NEWS
@ -11,6 +11,7 @@ NEWS ( CHANGELOG and HISTORY ) HTMLPurifier
|
|||||||
|
|
||||||
2.0.1, unknown release date
|
2.0.1, unknown release date
|
||||||
- Clean up special case code for <script> tags
|
- Clean up special case code for <script> tags
|
||||||
|
. Rewire some test-cases to swallow errors rather than expect them
|
||||||
|
|
||||||
2.0.0, released 2007-06-20
|
2.0.0, released 2007-06-20
|
||||||
# Completely refactored HTMLModuleManager, decentralizing safety
|
# Completely refactored HTMLModuleManager, decentralizing safety
|
||||||
|
@ -42,10 +42,13 @@ extends HTMLPurifier_ChildDefHarness
|
|||||||
$this->assertResult('Needs wrap', '<div>Needs wrap</div>',
|
$this->assertResult('Needs wrap', '<div>Needs wrap</div>',
|
||||||
array('HTML.BlockWrapper' => 'div'));
|
array('HTML.BlockWrapper' => 'div'));
|
||||||
|
|
||||||
$this->expectError('Cannot use non-block element as block wrapper.');
|
}
|
||||||
|
|
||||||
|
function testError() {
|
||||||
|
$this->obj = new HTMLPurifier_ChildDef_StrictBlockquote('div | p');
|
||||||
$this->assertResult('Needs wrap', '<p>Needs wrap</p>',
|
$this->assertResult('Needs wrap', '<p>Needs wrap</p>',
|
||||||
array('HTML.BlockWrapper' => 'dav'));
|
array('HTML.BlockWrapper' => 'dav'));
|
||||||
|
$this->swallowErrors();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -102,12 +102,15 @@ class HTMLPurifier_Strategy_FixNestingTest extends HTMLPurifier_StrategyHarness
|
|||||||
$this->assertResult(
|
$this->assertResult(
|
||||||
'<div>Reject</div>', 'Reject', array('HTML.Parent' => 'span')
|
'<div>Reject</div>', 'Reject', array('HTML.Parent' => 'span')
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function testError() {
|
||||||
// test fallback to div
|
// test fallback to div
|
||||||
$this->expectError('Cannot use unrecognized element as parent.');
|
$this->expectError('Cannot use unrecognized element as parent.');
|
||||||
$this->assertResult(
|
$this->assertResult(
|
||||||
'<div>Accept</div>', true, array('HTML.Parent' => 'obviously-impossible')
|
'<div>Accept</div>', true, array('HTML.Parent' => 'obviously-impossible')
|
||||||
);
|
);
|
||||||
|
$this->swallowErrors();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user