Merge branch 'master' into WebGUI8, up to 7.9.10. Some tests failing due to changes in default content.

This commit is contained in:
Colin Kuskie 2010-07-27 22:55:57 -07:00
commit ca9a3bd6c7
34 changed files with 386 additions and 49 deletions

View file

@ -83,7 +83,7 @@ is(
);
is(
WebGUI::Macro::FilePump::process($session, 'test bundle', 'CSS'),
sprintf(qq|<link rel="stylesheet" type="text/css" href="%s" >\n|,
sprintf(qq|<link rel="stylesheet" type="text/css" href="%s" />\n|,
join('/', $uploadsURL, 'filepump', $bundle->bundleUrl . '.'. $bundle->get('lastBuild'), $bundle->bundleUrl.'.css'),
),
'... check CSS file, normal mode'
@ -104,7 +104,7 @@ is(
);
is(
WebGUI::Macro::FilePump::process($session, 'test bundle', 'CSS'),
sprintf(qq|<link rel="stylesheet" type="text/css" href="/filePumpFileAsset" >\n|, $fileAsset->getUrl),
sprintf(qq|<link rel="stylesheet" type="text/css" href="/filePumpFileAsset" />\n|, $fileAsset->getUrl),
'... check CSS file, normal mode'
);
is(