Revert "[BUGFIX] Fix broken functional tests" 56/42456/2
authorAnja Leichsenring <aleichsenring@ab-softlab.de>
Sun, 9 Aug 2015 11:59:12 +0000 (13:59 +0200)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Sun, 9 Aug 2015 12:18:22 +0000 (14:18 +0200)
the original patch was never backported to 6.2, sorry for the hassle.

This reverts commit e65f253abfa056827766da247347fb102fb2e53a.

Change-Id: I515c4c896c1f258f675531128093e28174f02aaa
Reviewed-on: http://review.typo3.org/42456
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php

index 4cb5243..39cf0f7 100644 (file)
@@ -304,22 +304,22 @@ class PageRendererTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
                        'google with version number' => array(
                                '1.6.3',
                                'google',
-                               '#<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.3/jquery.js" type="text/javascript"></script>#'
+                               '#<script src="//ajax.googleapis.com/ajax/libs/jquery/1.6.3/jquery.js" type="text/javascript"></script>#'
                        ),
                        'msn with version number' => array(
                                '1.6.3',
                                'msn',
-                               '#<script src="https://ajax.aspnetcdn.com/ajax/jQuery/jquery-1.6.3.js" type="text/javascript"></script>#'
+                               '#<script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.6.3.js" type="text/javascript"></script>#'
                        ),
                        'jquery with version number' => array(
                                '1.6.3',
                                'jquery',
-                               '#<script src="https://code.jquery.com/jquery-1.6.3.js" type="text/javascript"></script>#'
+                               '#<script src="http://code.jquery.com/jquery-1.6.3.js" type="text/javascript"></script>#'
                        ),
                        'jquery with custom URL' => array(
                                '1.6.3',
-                               'https://my.cool.cdn/foo/jquery.js',
-                               '#<script src="https://my.cool.cdn/foo/jquery.js" type="text/javascript"></script>#'
+                               'http://my.cool.cdn/foo/jquery.js',
+                               '#<script src="http://my.cool.cdn/foo/jquery.js" type="text/javascript"></script>#'
                        ),
                );
        }
@@ -343,7 +343,7 @@ class PageRendererTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
        public function isJqueryLoadedMinifiedFromGoogleByDefault() {
                $subject = new \TYPO3\CMS\Core\Page\PageRenderer();
 
-               $expectedRegex = '#<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.3/jquery.min.js" type="text/javascript"></script>#';
+               $expectedRegex = '#<script src="//ajax.googleapis.com/ajax/libs/jquery/1.6.3/jquery.min.js" type="text/javascript"></script>#';
                $subject->loadJquery('1.6.3', 'google');
                $out = $subject->render();
                $this->assertRegExp($expectedRegex, $out);