Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

JSTesting: make sure wrapSummaryHtml is given a valid state

Browse source 
* wrapSummaryHTML() now really need one of three states or an exception
  is thrown.
* Moved a parameter incorrectly passed to addHtml() up to the previous
  wrapSummaryHtml() code. Per CR on r107919
This commit is contained in:
Antoine Musso 2012-01-04 10:31:02 +00:00
parent 434f82e596
commit 35b2dbcc43
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
includes/specials/SpecialJavaScriptTest.php
View file

@ -58,8 +58,10 @@ class SpecialJavaScriptTest extends SpecialPage {
$summary = $this->wrapSummaryHtml( '<p class="error">'
. wfMsg( 'javascripttest-pagetext-unknownframework', $par )
. '</p>'
. $this->getFrameworkListHtml() );
$out->addHtml( $summary, 'unknownframework' );
. $this->getFrameworkListHtml(),
'unknownframework'
);
$out->addHtml( $summary );
}
}
@ -84,10 +86,19 @@ class SpecialJavaScriptTest extends SpecialPage {
/**
* Function to wrap the summary.
* It must be given a valid state as a second parameter or an exception will
* be thrown.
* @param $html String: The raw HTML.
* @param $state String: State, one of 'noframework', 'unknownframework' or 'frameworkfound'
*/
private function wrapSummaryHtml( $html = '', $state ) {
private function wrapSummaryHtml( $html, $state ) {
$validStates = array( 'noframework', 'unknownframework', 'frameworkfound' );
if( !in_array( $state, $validStates ) ) {
throw new MWException( __METHOD__
. ' given an invalid state. Must be one of "'
. join( '", "', $validStates) . '".'
);
}
return "<div id=\"mw-javascripttest-summary\" class=\"mw-javascripttest-$state\">$html</div>";
}