r96349 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r96348‎ | r96349 | r96350 >
Date:16:47, 6 September 2011
Author:maxsem
Status:ok
Tags:
Comment:
Fix for r96344: explicitly set $wgExtensionAssetsPath during tests
Modified paths:
  • /trunk/extensions/wikihiero/tests.txt (modified) (history)
  • /trunk/phase3/tests/parser/parserTest.inc (modified) (history)
  • /trunk/phase3/tests/phpunit/includes/parser/NewParserTest.php (modified) (history)

Diff [purge]

Index: trunk/phase3/tests/phpunit/includes/parser/NewParserTest.php
——@@ -231,6 +231,7 @@
232232 'wgScript' => '/index.php',
233233 'wgScriptPath' => '/',
234234 'wgArticlePath' => '/wiki/$1',
 235+ 'wgExtensionAssetsPath' => '/extensions',
235236 'wgActionPaths' => array(),
236237 'wgLocalFileRepo' => array(
237238 'class' => 'LocalRepo',
Index: trunk/phase3/tests/parser/parserTest.inc
——@@ -136,13 +136,14 @@
137137 $wgUser, $wgLang, $wgOut, $wgRequest, $wgStyleDirectory, $wgEnableParserCache,
138138 $wgNamespaceAliases, $wgNamespaceProtection, $wgLocalFileRepo,
139139 $parserMemc, $wgThumbnailScriptPath, $wgScriptPath,
140 - $wgArticlePath, $wgStyleSheetPath, $wgScript, $wgStylePath;
 140+ $wgArticlePath, $wgStyleSheetPath, $wgScript, $wgStylePath, $wgExtensionAssetsPath;
141141
142142 $wgScript = '/index.php';
143143 $wgScriptPath = '/';
144144 $wgArticlePath = '/wiki/$1';
145145 $wgStyleSheetPath = '/skins';
146146 $wgStylePath = '/skins';
 147+ $wgExtensionAssetsPath = '/extensions';
147148 $wgThumbnailScriptPath = false;
148149 $wgLocalFileRepo = array(
149150 'class' => 'LocalRepo',
Index: trunk/extensions/wikihiero/tests.txt
——@@ -3,7 +3,7 @@
44 !! input
55 <hiero>A1 - B2 D3</hiero>
66 !! result
7 -<table class='mw-hiero-table mw-hiero-outer' dir='ltr'><tr><td> <table class="mw-hiero-table"><tr> <td><img style='margin:1px;' height='38' src='/w/extensions/wikihiero/img/hiero_A1.png' title='A1' alt='A1' /></td><td><img style='margin:1px;' height='38' src='/w/extensions/wikihiero/img/hiero_B2.png' title='B2' alt='B2' /></td><td><img style='margin:1px;' height='20' src='/w/extensions/wikihiero/img/hiero_D3.png' title='D3' alt='D3' /></td></tr></table> </td></tr></table>
 7+<table class='mw-hiero-table mw-hiero-outer' dir='ltr'><tr><td> <table class="mw-hiero-table"><tr> <td><img style='margin:1px;' height='38' src='/extensions/wikihiero/img/hiero_A1.png' title='A1' alt='A1' /></td><td><img style='margin:1px;' height='38' src='/extensions/wikihiero/img/hiero_B2.png' title='B2' alt='B2' /></td><td><img style='margin:1px;' height='20' src='/extensions/wikihiero/img/hiero_D3.png' title='D3' alt='D3' /></td></tr></table> </td></tr></table>
88
99 !! end
1010
——@@ -21,7 +21,7 @@
2222 !! input
2323 <hiero>a:A1</hiero>
2424 !! result
25 -<table class='mw-hiero-table mw-hiero-outer' dir='ltr'><tr><td> <table class="mw-hiero-table"><tr> <td><img style='margin:1px;' height='38' src='/w/extensions/wikihiero/img/hiero_a&amp;A1.png' title='a&amp;A1' alt='a&amp;A1' /></td> </tr></table> </td></tr></table>
 25+<table class='mw-hiero-table mw-hiero-outer' dir='ltr'><tr><td> <table class="mw-hiero-table"><tr> <td><img style='margin:1px;' height='38' src='/extensions/wikihiero/img/hiero_a&amp;A1.png' title='a&amp;A1' alt='a&amp;A1' /></td> </tr></table> </td></tr></table>
2626
2727 !! end
2828
——@@ -30,7 +30,7 @@
3131 !! input
3232 <hiero>N28:Aa13-R19-t:N24</hiero>
3333 !! result
34 -<table class='mw-hiero-table mw-hiero-outer' dir='ltr'><tr><td> <table class="mw-hiero-table"><tr> <td><img style='margin:1px;' height='15' src='/w/extensions/wikihiero/img/hiero_N28.png' title='N28' alt='N28' /><br /><img style='margin:1px;' height='8' src='/w/extensions/wikihiero/img/hiero_Aa13.png' title='Aa13' alt='Aa13' /></td> <td><img style='margin:1px;' height='38' src='/w/extensions/wikihiero/img/hiero_R19.png' title='R19' alt='R19' /></td><td><img style='margin:1px;' height='11' src='/w/extensions/wikihiero/img/hiero_X1.png' title='X1 [t]' alt='t' /><br /><img style='margin:1px;' height='14' src='/w/extensions/wikihiero/img/hiero_N24.png' title='N24' alt='N24' /></td> </tr></table> </td></tr></table>
 34+<table class='mw-hiero-table mw-hiero-outer' dir='ltr'><tr><td> <table class="mw-hiero-table"><tr> <td><img style='margin:1px;' height='15' src='/extensions/wikihiero/img/hiero_N28.png' title='N28' alt='N28' /><br /><img style='margin:1px;' height='8' src='/extensions/wikihiero/img/hiero_Aa13.png' title='Aa13' alt='Aa13' /></td> <td><img style='margin:1px;' height='38' src='/extensions/wikihiero/img/hiero_R19.png' title='R19' alt='R19' /></td><td><img style='margin:1px;' height='11' src='/extensions/wikihiero/img/hiero_X1.png' title='X1 [t]' alt='t' /><br /><img style='margin:1px;' height='14' src='/extensions/wikihiero/img/hiero_N24.png' title='N24' alt='N24' /></td> </tr></table> </td></tr></table>
3535
3636 !! end
3737
——@@ -39,7 +39,7 @@
4040 !! input
4141 <hiero>N5-O34:N29-N35:N35</hiero>
4242 !! result
43 -<table class='mw-hiero-table mw-hiero-outer' dir='ltr'><tr><td> <table class="mw-hiero-table"><tr> <td><img style='margin:1px;' height='18' src='/w/extensions/wikihiero/img/hiero_N5.png' title='N5' alt='N5' /></td><td><img style='margin:1px;' height='6' src='/w/extensions/wikihiero/img/hiero_O34.png' title='O34' alt='O34' /><br /><img style='margin:1px;' height='17' src='/w/extensions/wikihiero/img/hiero_N29.png' title='N29' alt='N29' /></td> <td><img style='margin:1px;' height='5' src='/w/extensions/wikihiero/img/hiero_N35.png' title='N35' alt='N35' /><br /><img style='margin:1px;' height='5' src='/w/extensions/wikihiero/img/hiero_N35.png' title='N35' alt='N35' /></td> </tr></table> </td></tr></table>
 43+<table class='mw-hiero-table mw-hiero-outer' dir='ltr'><tr><td> <table class="mw-hiero-table"><tr> <td><img style='margin:1px;' height='18' src='/extensions/wikihiero/img/hiero_N5.png' title='N5' alt='N5' /></td><td><img style='margin:1px;' height='6' src='/extensions/wikihiero/img/hiero_O34.png' title='O34' alt='O34' /><br /><img style='margin:1px;' height='17' src='/extensions/wikihiero/img/hiero_N29.png' title='N29' alt='N29' /></td> <td><img style='margin:1px;' height='5' src='/extensions/wikihiero/img/hiero_N35.png' title='N35' alt='N35' /><br /><img style='margin:1px;' height='5' src='/extensions/wikihiero/img/hiero_N35.png' title='N35' alt='N35' /></td> </tr></table> </td></tr></table>
4444
4545 !! end
4646
——@@ -49,6 +49,6 @@
5050 <hiero>M23-X1:R4-X8-Q2:D4-W17-R14-G4-R8-O29:V30-U23 !
5151 N26-D58-O49:Z1-F13:N31-V30:N16:N21*Z1-D45:N25</hiero>
5252 !! result
53 -<table class='mw-hiero-table mw-hiero-outer' dir='ltr'><tr><td> <table class="mw-hiero-table"><tr> <td><img style='margin:1px;' height='38' src='/w/extensions/wikihiero/img/hiero_M23.png' title='M23' alt='M23' /></td><td><img style='margin:1px;' height='11' src='/w/extensions/wikihiero/img/hiero_X1.png' title='X1' alt='X1' /><br /><img style='margin:1px;' height='15' src='/w/extensions/wikihiero/img/hiero_R4.png' title='R4' alt='R4' /></td> <td><img style='margin:1px;' height='38' src='/w/extensions/wikihiero/img/hiero_X8.png' title='X8' alt='X8' /></td><td><img style='margin:1px;' height='24' src='/w/extensions/wikihiero/img/hiero_Q2.png' title='Q2' alt='Q2' /><br /><img style='margin:1px;' height='12' src='/w/extensions/wikihiero/img/hiero_D4.png' title='D4' alt='D4' /></td> <td><img style='margin:1px;' height='38' src='/w/extensions/wikihiero/img/hiero_W17.png' title='W17' alt='W17' /></td><td><img style='margin:1px;' height='38' src='/w/extensions/wikihiero/img/hiero_R14.png' title='R14' alt='R14' /></td><td><img style='margin:1px;' height='38' src='/w/extensions/wikihiero/img/hiero_G4.png' title='G4' alt='G4' /></td><td><img style='margin:1px;' height='38' src='/w/extensions/wikihiero/img/hiero_R8.png' title='R8' alt='R8' /></td><td><img style='margin:1px;' height='7' src='/w/extensions/wikihiero/img/hiero_O29.png' title='O29' alt='O29' /><br /><img style='margin:1px;' height='12' src='/w/extensions/wikihiero/img/hiero_V30.png' title='V30' alt='V30' /></td> <td><img style='margin:1px;' height='38' src='/w/extensions/wikihiero/img/hiero_U23.png' title='U23' alt='U23' /></td></tr></table><table class="mw-hiero-table"><tr> <td><img style='margin:1px;' height='15' src='/w/extensions/wikihiero/img/hiero_N26.png' title='N26' alt='N26' /></td><td><img style='margin:1px;' height='35' src='/w/extensions/wikihiero/img/hiero_D58.png' title='D58' alt='D58' /></td><td><img style='margin:1px;' height='18' src='/w/extensions/wikihiero/img/hiero_O49.png' title='O49' alt='O49' /><br /><img style='margin:1px;' height='16' src='/w/extensions/wikihiero/img/hiero_Z1.png' title='Z1' alt='Z1' /></td> <td><img style='margin:1px;' height='22' src='/w/extensions/wikihiero/img/hiero_F13.png' title='F13' alt='F13' /><br /><img style='margin:1px;' height='17' src='/w/extensions/wikihiero/img/hiero_N31.png' title='N31' alt='N31' /></td> <td><img style='margin:1px;' height='12' src='/w/extensions/wikihiero/img/hiero_V30.png' title='V30' alt='V30' /><br /><img style='margin:1px;' height='9' src='/w/extensions/wikihiero/img/hiero_N16.png' title='N16' alt='N16' /><br /><img style='margin:1px;' height='11' src='/w/extensions/wikihiero/img/hiero_N21.png' title='N21' alt='N21' /> <img style='margin:1px;' height='16' src='/w/extensions/wikihiero/img/hiero_Z1.png' title='Z1' alt='Z1' /></td> <td><img style='margin:1px;' height='24' src='/w/extensions/wikihiero/img/hiero_D45.png' title='D45' alt='D45' /><br /><img style='margin:1px;' height='16' src='/w/extensions/wikihiero/img/hiero_N25.png' title='N25' alt='N25' /></td> </tr></table> </td></tr></table>
 53+<table class='mw-hiero-table mw-hiero-outer' dir='ltr'><tr><td> <table class="mw-hiero-table"><tr> <td><img style='margin:1px;' height='38' src='/extensions/wikihiero/img/hiero_M23.png' title='M23' alt='M23' /></td><td><img style='margin:1px;' height='11' src='/extensions/wikihiero/img/hiero_X1.png' title='X1' alt='X1' /><br /><img style='margin:1px;' height='15' src='/extensions/wikihiero/img/hiero_R4.png' title='R4' alt='R4' /></td> <td><img style='margin:1px;' height='38' src='/extensions/wikihiero/img/hiero_X8.png' title='X8' alt='X8' /></td><td><img style='margin:1px;' height='24' src='/extensions/wikihiero/img/hiero_Q2.png' title='Q2' alt='Q2' /><br /><img style='margin:1px;' height='12' src='/extensions/wikihiero/img/hiero_D4.png' title='D4' alt='D4' /></td> <td><img style='margin:1px;' height='38' src='/extensions/wikihiero/img/hiero_W17.png' title='W17' alt='W17' /></td><td><img style='margin:1px;' height='38' src='/extensions/wikihiero/img/hiero_R14.png' title='R14' alt='R14' /></td><td><img style='margin:1px;' height='38' src='/extensions/wikihiero/img/hiero_G4.png' title='G4' alt='G4' /></td><td><img style='margin:1px;' height='38' src='/extensions/wikihiero/img/hiero_R8.png' title='R8' alt='R8' /></td><td><img style='margin:1px;' height='7' src='/extensions/wikihiero/img/hiero_O29.png' title='O29' alt='O29' /><br /><img style='margin:1px;' height='12' src='/extensions/wikihiero/img/hiero_V30.png' title='V30' alt='V30' /></td> <td><img style='margin:1px;' height='38' src='/extensions/wikihiero/img/hiero_U23.png' title='U23' alt='U23' /></td></tr></table><table class="mw-hiero-table"><tr> <td><img style='margin:1px;' height='15' src='/extensions/wikihiero/img/hiero_N26.png' title='N26' alt='N26' /></td><td><img style='margin:1px;' height='35' src='/extensions/wikihiero/img/hiero_D58.png' title='D58' alt='D58' /></td><td><img style='margin:1px;' height='18' src='/extensions/wikihiero/img/hiero_O49.png' title='O49' alt='O49' /><br /><img style='margin:1px;' height='16' src='/extensions/wikihiero/img/hiero_Z1.png' title='Z1' alt='Z1' /></td> <td><img style='margin:1px;' height='22' src='/extensions/wikihiero/img/hiero_F13.png' title='F13' alt='F13' /><br /><img style='margin:1px;' height='17' src='/extensions/wikihiero/img/hiero_N31.png' title='N31' alt='N31' /></td> <td><img style='margin:1px;' height='12' src='/extensions/wikihiero/img/hiero_V30.png' title='V30' alt='V30' /><br /><img style='margin:1px;' height='9' src='/extensions/wikihiero/img/hiero_N16.png' title='N16' alt='N16' /><br /><img style='margin:1px;' height='11' src='/extensions/wikihiero/img/hiero_N21.png' title='N21' alt='N21' /> <img style='margin:1px;' height='16' src='/extensions/wikihiero/img/hiero_Z1.png' title='Z1' alt='Z1' /></td> <td><img style='margin:1px;' height='24' src='/extensions/wikihiero/img/hiero_D45.png' title='D45' alt='D45' /><br /><img style='margin:1px;' height='16' src='/extensions/wikihiero/img/hiero_N25.png' title='N25' alt='N25' /></td> </tr></table> </td></tr></table>
5454
5555 !! end

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r96344WikiHiero - parser testsmaxsem15:43, 6 September 2011

Status & tagging log