[BUGFIX] Fix broken functional tests 88/38288/3
authorAndreas Fernandez <a.fernandez@scripting-base.de>
Fri, 27 Mar 2015 01:18:58 +0000 (02:18 +0100)
committerFrank Nägler <typo3@naegler.net>
Fri, 27 Mar 2015 01:25:01 +0000 (02:25 +0100)
Patch Iec7381c8a5898dd18128c9933ce0cc2bdbd0a835 introduced
a regression that causes failing functional tests. The paths
to scriptaculous are changed to the new bower paths.

Resolves: #66080
Releases: master
Change-Id: I2f42a62a0b99de782be00d889ea441e0c14e5a1b
Reviewed-on: http://review.typo3.org/38288
Reviewed-by: Frank Nägler <typo3@naegler.net>
Tested-by: Frank Nägler <typo3@naegler.net>
typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php

index fc69e86..fb6d140 100644 (file)
@@ -82,10 +82,10 @@ class PageRendererTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
                $subject->loadPrototype();
 
                $subject->loadScriptaculous('slider,controls');
                $subject->loadPrototype();
 
                $subject->loadScriptaculous('slider,controls');
-               $expectedScriptaculousMain = '<script src="contrib/scriptaculous/scriptaculous.js" type="text/javascript"></script>';
-               $expectedScriptaculousEffects = '<script src="contrib/scriptaculous/effects.js" type="text/javascript"></script>';
-               $expectedScriptaculousControls = '<script src="contrib/scriptaculous/controls.js" type="text/javascript"></script>';
-               $expectedScriptaculousSlider  = '<script src="contrib/scriptaculous/slider.js" type="text/javascript"></script>';
+               $expectedScriptaculousMain = '<script src="sysext/core/Resources/Public/JavaScript/Contrib/scriptaculous/scriptaculous.js" type="text/javascript"></script>';
+               $expectedScriptaculousEffects = '<script src="sysext/core/Resources/Public/JavaScript/Contrib/scriptaculous/effects.js" type="text/javascript"></script>';
+               $expectedScriptaculousControls = '<script src="sysext/core/Resources/Public/JavaScript/Contrib/scriptaculous/controls.js" type="text/javascript"></script>';
+               $expectedScriptaculousSlider  = '<script src="sysext/core/Resources/Public/JavaScript/Contrib/scriptaculous/slider.js" type="text/javascript"></script>';
 
                $subject->loadJquery();
                $expectedJqueryRegExp = '#<script src="contrib/jquery/jquery-' . \TYPO3\CMS\Core\Page\PageRenderer::JQUERY_VERSION_LATEST . '\\.min\\.(js|\\d+\\.js|js\\?\\d+)" type="text/javascript"></script>#';
 
                $subject->loadJquery();
                $expectedJqueryRegExp = '#<script src="contrib/jquery/jquery-' . \TYPO3\CMS\Core\Page\PageRenderer::JQUERY_VERSION_LATEST . '\\.min\\.(js|\\d+\\.js|js\\?\\d+)" type="text/javascript"></script>#';