Development

Changeset 3299

You must first sign up to be able to contribute.

Changeset 3299

Show
Ignore:
Timestamp:
01/17/07 07:20:21 (2 years ago)
Author:
fabien
Message:

fixed sfViewConfigHandler tests on windows

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/test/unit/config/sfViewConfigHandlerTest.php

    r3289 r3299  
    4040 
    4141EOF; 
    42 $t->is($handler->addHtmlAsset('myView'), $content, 'addHtmlAsset() adds stylesheets to the response'); 
    43  
    44 $handler->mergeConfig(array( 
    45   'myView' => array( 
    46     'javascripts' => array('foobar'), 
    47   ), 
    48 )); 
    49 $content = <<<EOF 
    50   \$response->addJavascript('foobar'); 
    51  
    52 EOF; 
    53 $t->is($handler->addHtmlAsset('myView'), $content, 'addHtmlAsset() adds JavaScript to the response'); 
     42$t->is(fix_content($handler->addHtmlAsset('myView')), fix_content($content), 'addHtmlAsset() adds stylesheets to the response'); 
     43 
     44$handler->mergeConfig(array( 
     45  'myView' => array( 
     46    'javascripts' => array('foobar'), 
     47  ), 
     48)); 
     49$content = <<<EOF 
     50  \$response->addJavascript('foobar'); 
     51 
     52EOF; 
     53$t->is(fix_content($handler->addHtmlAsset('myView')), fix_content($content), 'addHtmlAsset() adds JavaScript to the response'); 
    5454 
    5555// Insertion order for stylesheets 
    …… 
    6969 
    7070EOF; 
    71 $t->is($handler->addHtmlAsset('myView'), $content, 'addHtmlAsset() adds view-specific stylesheets after application-wide assets'); 
     71$t->is(fix_content($handler->addHtmlAsset('myView')), fix_content($content), 'addHtmlAsset() adds view-specific stylesheets after application-wide assets'); 
    7272 
    7373$handler->mergeConfig(array( 
    …… 
    8484 
    8585EOF; 
    86 $t->is($handler->addHtmlAsset('myView'), $content, 'addHtmlAsset() adds view-specific stylesheets after application-wide assets'); 
     86$t->is(fix_content($handler->addHtmlAsset('myView')), fix_content($content), 'addHtmlAsset() adds view-specific stylesheets after application-wide assets'); 
    8787 
    8888$handler->mergeConfig(array( 
    …… 
    9999 
    100100EOF; 
    101 $t->is($handler->addHtmlAsset('myView'), $content, 'addHtmlAsset() adds view-specific stylesheets after default assets'); 
     101$t->is(fix_content($handler->addHtmlAsset('myView')), fix_content($content), 'addHtmlAsset() adds view-specific stylesheets after default assets'); 
    102102 
    103103$handler->mergeConfig(array( 
    …… 
    114114 
    115115EOF; 
    116 $t->is($handler->addHtmlAsset('myView'), $content, 'addHtmlAsset() adds view-specific stylesheets after default assets'); 
     116$t->is(fix_content($handler->addHtmlAsset('myView')), fix_content($content), 'addHtmlAsset() adds view-specific stylesheets after default assets'); 
    117117 
    118118$handler->mergeConfig(array( 
    …… 
    129129 
    130130EOF; 
    131 $t->is($handler->addHtmlAsset('myView'), $content, 'addHtmlAsset() adds application-specific stylesheets after default assets'); 
     131$t->is(fix_content($handler->addHtmlAsset('myView')), fix_content($content), 'addHtmlAsset() adds application-specific stylesheets after default assets'); 
    132132 
    133133$handler->mergeConfig(array( 
    …… 
    144144 
    145145EOF; 
    146 $t->is($handler->addHtmlAsset('myView'), $content, 'addHtmlAsset() adds application-specific stylesheets after default assets'); 
     146$t->is(fix_content($handler->addHtmlAsset('myView')), fix_content($content), 'addHtmlAsset() adds application-specific stylesheets after default assets'); 
    147147 
    148148// Insertion order for javascripts 
    …… 
    162162 
    163163EOF; 
    164 $t->is($handler->addHtmlAsset('myView'), $content, 'addHtmlAsset() adds view-specific javascripts after application-wide assets'); 
     164$t->is(fix_content($handler->addHtmlAsset('myView')), fix_content($content), 'addHtmlAsset() adds view-specific javascripts after application-wide assets'); 
    165165 
    166166$handler->mergeConfig(array( 
    …… 
    177177 
    178178EOF; 
    179 $t->is($handler->addHtmlAsset('myView'), $content, 'addHtmlAsset() adds view-specific javascripts after application-wide assets'); 
     179$t->is(fix_content($handler->addHtmlAsset('myView')), fix_content($content), 'addHtmlAsset() adds view-specific javascripts after application-wide assets'); 
    180180 
    181181$handler->mergeConfig(array( 
    …… 
    192192 
    193193EOF; 
    194 $t->is($handler->addHtmlAsset('myView'), $content, 'addHtmlAsset() adds view-specific javascripts after default assets'); 
     194$t->is(fix_content($handler->addHtmlAsset('myView')), fix_content($content), 'addHtmlAsset() adds view-specific javascripts after default assets'); 
    195195 
    196196$handler->mergeConfig(array( 
    …… 
    207207 
    208208EOF; 
    209 $t->is($handler->addHtmlAsset('myView'), $content, 'addHtmlAsset() adds view-specific javascripts after default assets'); 
     209$t->is(fix_content($handler->addHtmlAsset('myView')), fix_content($content), 'addHtmlAsset() adds view-specific javascripts after default assets'); 
    210210 
    211211$handler->mergeConfig(array( 
    …… 
    222222 
    223223EOF; 
    224 $t->is($handler->addHtmlAsset('myView'), $content, 'addHtmlAsset() adds application-specific javascripts after default assets'); 
     224$t->is(fix_content($handler->addHtmlAsset('myView')), fix_content($content), 'addHtmlAsset() adds application-specific javascripts after default assets'); 
    225225 
    226226$handler->mergeConfig(array( 
    …… 
    237237 
    238238EOF; 
    239 $t->is($handler->addHtmlAsset('myView'), $content, 'addHtmlAsset() adds application-specific javascripts after default assets'); 
     239$t->is(fix_content($handler->addHtmlAsset('myView')), fix_content($content), 'addHtmlAsset() adds application-specific javascripts after default assets'); 
    240240 
    241241// removal of assets 
    …… 
    255255 
    256256EOF; 
    257 $t->is($handler->addHtmlAsset('myView'), $content, 'addHtmlAsset() supports the - option to remove one stylesheet previously added'); 
     257$t->is(fix_content($handler->addHtmlAsset('myView')), fix_content($content), 'addHtmlAsset() supports the - option to remove one stylesheet previously added'); 
    258258 
    259259$handler->mergeConfig(array( 
    …… 
    270270 
    271271EOF; 
    272 $t->is($handler->addHtmlAsset('myView'), $content, 'addHtmlAsset() supports the - option to remove one javascript previously added'); 
     272$t->is(fix_content($handler->addHtmlAsset('myView')), fix_content($content), 'addHtmlAsset() supports the - option to remove one javascript previously added'); 
    273273 
    274274$handler->mergeConfig(array( 
    …… 
    281281 
    282282EOF; 
    283 $t->is($handler->addHtmlAsset('myView'), $content, 'addHtmlAsset() supports the -* option to remove all stylesheets previously added'); 
     283$t->is(fix_content($handler->addHtmlAsset('myView')), fix_content($content), 'addHtmlAsset() supports the -* option to remove all stylesheets previously added'); 
    284284 
    285285$handler->mergeConfig(array( 
    …… 
    292292 
    293293EOF; 
    294 $t->is($handler->addHtmlAsset('myView'), $content, 'addHtmlAsset() supports the -* option to remove all javascripts previously added'); 
     294$t->is(fix_content($handler->addHtmlAsset('myView')), fix_content($content), 'addHtmlAsset() supports the -* option to remove all javascripts previously added'); 
    295295 
    296296$handler->mergeConfig(array( 
    …… 
    306306 
    307307EOF; 
    308 $t->is($handler->addHtmlAsset('myView'), $content, 'addHtmlAsset() supports the -* option to remove all assets previously added'); 
    309  
     308$t->is(fix_content($handler->addHtmlAsset('myView')), fix_content($content), 'addHtmlAsset() supports the -* option to remove all assets previously added'); 
    310309 
    311310$handler->mergeConfig(array( 
    …… 
    328327 
    329328EOF; 
    330 $t->is($handler->addHtmlAsset('myView'), $content, 'addHtmlAsset() supports the -* option to remove all assets previously added'); 
     329$t->is(fix_content($handler->addHtmlAsset('myView')), fix_content($content), 'addHtmlAsset() supports the -* option to remove all assets previously added'); 
     330 
     331function fix_content($content) 
     332{ 
     333  return str_replace(array("\r\n", "\n", "\r"), "\n", $content); 
     334}