opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.0.3. For more information, see https://www.drupal.org/drupal-8.0.3-release-notes

Browse source
This commit is contained in:
Pantheon Automation 2016-02-03 14:56:31 -08:00 • committed by Greg Anderson
parent 10f9f7fbde
commit 9db4fae9a7
202 changed files with 3806 additions and 760 deletions
Download patch file Download diff file Expand all files Collapse all files

273
core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
View file

@ -9,9 +9,9 @@
namespace {
/**
* CssRenderer uses file_create_url(), which *is* available when using the
* Simpletest test runner, but not when using the PHPUnit test runner; hence
* this hack.
* CssCollectionRenderer uses file_create_url() & file_url_transform_relative(),
* which *are* available when using the Simpletest test runner, but not when
* using the PHPUnit test runner; hence this hack.
*/
if (!function_exists('file_create_url')) {
@ -23,6 +23,17 @@ if (!function_exists('file_create_url')) {
return 'file_create_url:' . $uri;
}
}
if (!function_exists('file_url_transform_relative')) {
/**
* Temporary mock of file_url_transform_relative, until that is moved into
* Component/Utility.
*/
function file_url_transform_relative($uri) {
return 'file_url_transform_relative:' . $uri;
}
}
}
@ -153,7 +164,7 @@ class CssCollectionRendererUnitTest extends UnitTestCase {
0 => array('group' => 0, 'type' => 'file', 'media' => 'all', 'preprocess' => TRUE, 'data' => 'public://css/file-all', 'browsers' => array()),
),
array(
0 => $create_link_element(file_create_url('public://css/file-all') . '?0', 'all'),
0 => $create_link_element(file_url_transform_relative(file_create_url('public://css/file-all')) . '?0', 'all'),
),
),
// 31 file CSS assets: expect 31 link elements.
@ -192,37 +203,37 @@ class CssCollectionRendererUnitTest extends UnitTestCase {
30 => $create_file_css_asset('public://css/31.css'),
),
array(
0 => $create_link_element(file_create_url('public://css/1.css') . '?0'),
1 => $create_link_element(file_create_url('public://css/2.css') . '?0'),
2 => $create_link_element(file_create_url('public://css/3.css') . '?0'),
3 => $create_link_element(file_create_url('public://css/4.css') . '?0'),
4 => $create_link_element(file_create_url('public://css/5.css') . '?0'),
5 => $create_link_element(file_create_url('public://css/6.css') . '?0'),
6 => $create_link_element(file_create_url('public://css/7.css') . '?0'),
7 => $create_link_element(file_create_url('public://css/8.css') . '?0'),
8 => $create_link_element(file_create_url('public://css/9.css') . '?0'),
9 => $create_link_element(file_create_url('public://css/10.css') . '?0'),
10 => $create_link_element(file_create_url('public://css/11.css') . '?0'),
11 => $create_link_element(file_create_url('public://css/12.css') . '?0'),
12 => $create_link_element(file_create_url('public://css/13.css') . '?0'),
13 => $create_link_element(file_create_url('public://css/14.css') . '?0'),
14 => $create_link_element(file_create_url('public://css/15.css') . '?0'),
15 => $create_link_element(file_create_url('public://css/16.css') . '?0'),
16 => $create_link_element(file_create_url('public://css/17.css') . '?0'),
17 => $create_link_element(file_create_url('public://css/18.css') . '?0'),
18 => $create_link_element(file_create_url('public://css/19.css') . '?0'),
19 => $create_link_element(file_create_url('public://css/20.css') . '?0'),
20 => $create_link_element(file_create_url('public://css/21.css') . '?0'),
21 => $create_link_element(file_create_url('public://css/22.css') . '?0'),
22 => $create_link_element(file_create_url('public://css/23.css') . '?0'),
23 => $create_link_element(file_create_url('public://css/24.css') . '?0'),
24 => $create_link_element(file_create_url('public://css/25.css') . '?0'),
25 => $create_link_element(file_create_url('public://css/26.css') . '?0'),
26 => $create_link_element(file_create_url('public://css/27.css') . '?0'),
27 => $create_link_element(file_create_url('public://css/28.css') . '?0'),
28 => $create_link_element(file_create_url('public://css/29.css') . '?0'),
29 => $create_link_element(file_create_url('public://css/30.css') . '?0'),
30 => $create_link_element(file_create_url('public://css/31.css') . '?0'),
0 => $create_link_element(file_url_transform_relative(file_create_url('public://css/1.css')) . '?0'),
1 => $create_link_element(file_url_transform_relative(file_create_url('public://css/2.css')) . '?0'),
2 => $create_link_element(file_url_transform_relative(file_create_url('public://css/3.css')) . '?0'),
3 => $create_link_element(file_url_transform_relative(file_create_url('public://css/4.css')) . '?0'),
4 => $create_link_element(file_url_transform_relative(file_create_url('public://css/5.css')) . '?0'),
5 => $create_link_element(file_url_transform_relative(file_create_url('public://css/6.css')) . '?0'),
6 => $create_link_element(file_url_transform_relative(file_create_url('public://css/7.css')) . '?0'),
7 => $create_link_element(file_url_transform_relative(file_create_url('public://css/8.css')) . '?0'),
8 => $create_link_element(file_url_transform_relative(file_create_url('public://css/9.css')) . '?0'),
9 => $create_link_element(file_url_transform_relative(file_create_url('public://css/10.css')) . '?0'),
10 => $create_link_element(file_url_transform_relative(file_create_url('public://css/11.css')) . '?0'),
11 => $create_link_element(file_url_transform_relative(file_create_url('public://css/12.css')) . '?0'),
12 => $create_link_element(file_url_transform_relative(file_create_url('public://css/13.css')) . '?0'),
13 => $create_link_element(file_url_transform_relative(file_create_url('public://css/14.css')) . '?0'),
14 => $create_link_element(file_url_transform_relative(file_create_url('public://css/15.css')) . '?0'),
15 => $create_link_element(file_url_transform_relative(file_create_url('public://css/16.css')) . '?0'),
16 => $create_link_element(file_url_transform_relative(file_create_url('public://css/17.css')) . '?0'),
17 => $create_link_element(file_url_transform_relative(file_create_url('public://css/18.css')) . '?0'),
18 => $create_link_element(file_url_transform_relative(file_create_url('public://css/19.css')) . '?0'),
19 => $create_link_element(file_url_transform_relative(file_create_url('public://css/20.css')) . '?0'),
20 => $create_link_element(file_url_transform_relative(file_create_url('public://css/21.css')) . '?0'),
21 => $create_link_element(file_url_transform_relative(file_create_url('public://css/22.css')) . '?0'),
22 => $create_link_element(file_url_transform_relative(file_create_url('public://css/23.css')) . '?0'),
23 => $create_link_element(file_url_transform_relative(file_create_url('public://css/24.css')) . '?0'),
24 => $create_link_element(file_url_transform_relative(file_create_url('public://css/25.css')) . '?0'),
25 => $create_link_element(file_url_transform_relative(file_create_url('public://css/26.css')) . '?0'),
26 => $create_link_element(file_url_transform_relative(file_create_url('public://css/27.css')) . '?0'),
27 => $create_link_element(file_url_transform_relative(file_create_url('public://css/28.css')) . '?0'),
28 => $create_link_element(file_url_transform_relative(file_create_url('public://css/29.css')) . '?0'),
29 => $create_link_element(file_url_transform_relative(file_create_url('public://css/30.css')) . '?0'),
30 => $create_link_element(file_url_transform_relative(file_create_url('public://css/31.css')) . '?0'),
),
),
// 32 file CSS assets with the same properties: expect 2 style elements.
@ -263,40 +274,40 @@ class CssCollectionRendererUnitTest extends UnitTestCase {
),
array(
0 => $create_style_element('
@import url("' . file_create_url('public://css/1.css') . '?0");
@import url("' . file_create_url('public://css/2.css') . '?0");
@import url("' . file_create_url('public://css/3.css') . '?0");
@import url("' . file_create_url('public://css/4.css') . '?0");
@import url("' . file_create_url('public://css/5.css') . '?0");
@import url("' . file_create_url('public://css/6.css') . '?0");
@import url("' . file_create_url('public://css/7.css') . '?0");
@import url("' . file_create_url('public://css/8.css') . '?0");
@import url("' . file_create_url('public://css/9.css') . '?0");
@import url("' . file_create_url('public://css/10.css') . '?0");
@import url("' . file_create_url('public://css/11.css') . '?0");
@import url("' . file_create_url('public://css/12.css') . '?0");
@import url("' . file_create_url('public://css/13.css') . '?0");
@import url("' . file_create_url('public://css/14.css') . '?0");
@import url("' . file_create_url('public://css/15.css') . '?0");
@import url("' . file_create_url('public://css/16.css') . '?0");
@import url("' . file_create_url('public://css/17.css') . '?0");
@import url("' . file_create_url('public://css/18.css') . '?0");
@import url("' . file_create_url('public://css/19.css') . '?0");
@import url("' . file_create_url('public://css/20.css') . '?0");
@import url("' . file_create_url('public://css/21.css') . '?0");
@import url("' . file_create_url('public://css/22.css') . '?0");
@import url("' . file_create_url('public://css/23.css') . '?0");
@import url("' . file_create_url('public://css/24.css') . '?0");
@import url("' . file_create_url('public://css/25.css') . '?0");
@import url("' . file_create_url('public://css/26.css') . '?0");
@import url("' . file_create_url('public://css/27.css') . '?0");
@import url("' . file_create_url('public://css/28.css') . '?0");
@import url("' . file_create_url('public://css/29.css') . '?0");
@import url("' . file_create_url('public://css/30.css') . '?0");
@import url("' . file_create_url('public://css/31.css') . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/1.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/2.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/3.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/4.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/5.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/6.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/7.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/8.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/9.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/10.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/11.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/12.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/13.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/14.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/15.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/16.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/17.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/18.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/19.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/20.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/21.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/22.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/23.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/24.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/25.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/26.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/27.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/28.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/29.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/30.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/31.css')) . '?0");
', 'all'),
1 => $create_style_element('
@import url("' . file_create_url('public://css/32.css') . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/32.css')) . '?0");
', 'all'),
),
),
@ -340,46 +351,46 @@ class CssCollectionRendererUnitTest extends UnitTestCase {
),
array(
0 => $create_style_element('
@import url("' . file_create_url('public://css/1.css') . '?0");
@import url("' . file_create_url('public://css/2.css') . '?0");
@import url("' . file_create_url('public://css/3.css') . '?0");
@import url("' . file_create_url('public://css/4.css') . '?0");
@import url("' . file_create_url('public://css/5.css') . '?0");
@import url("' . file_create_url('public://css/6.css') . '?0");
@import url("' . file_create_url('public://css/7.css') . '?0");
@import url("' . file_create_url('public://css/8.css') . '?0");
@import url("' . file_create_url('public://css/9.css') . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/1.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/2.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/3.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/4.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/5.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/6.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/7.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/8.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/9.css')) . '?0");
', 'all'),
1 => $create_style_element('
@import url("' . file_create_url('public://css/10.css') . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/10.css')) . '?0");
', 'screen'),
2 => $create_style_element('
@import url("' . file_create_url('public://css/11.css') . '?0");
@import url("' . file_create_url('public://css/12.css') . '?0");
@import url("' . file_create_url('public://css/13.css') . '?0");
@import url("' . file_create_url('public://css/14.css') . '?0");
@import url("' . file_create_url('public://css/15.css') . '?0");
@import url("' . file_create_url('public://css/16.css') . '?0");
@import url("' . file_create_url('public://css/17.css') . '?0");
@import url("' . file_create_url('public://css/18.css') . '?0");
@import url("' . file_create_url('public://css/19.css') . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/11.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/12.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/13.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/14.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/15.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/16.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/17.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/18.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/19.css')) . '?0");
', 'all'),
3 => $create_style_element('
@import url("' . file_create_url('public://css/20.css') . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/20.css')) . '?0");
', 'print'),
4 => $create_style_element('
@import url("' . file_create_url('public://css/21.css') . '?0");
@import url("' . file_create_url('public://css/22.css') . '?0");
@import url("' . file_create_url('public://css/23.css') . '?0");
@import url("' . file_create_url('public://css/24.css') . '?0");
@import url("' . file_create_url('public://css/25.css') . '?0");
@import url("' . file_create_url('public://css/26.css') . '?0");
@import url("' . file_create_url('public://css/27.css') . '?0");
@import url("' . file_create_url('public://css/28.css') . '?0");
@import url("' . file_create_url('public://css/29.css') . '?0");
@import url("' . file_create_url('public://css/30.css') . '?0");
@import url("' . file_create_url('public://css/31.css') . '?0");
@import url("' . file_create_url('public://css/32.css') . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/21.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/22.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/23.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/24.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/25.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/26.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/27.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/28.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/29.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/30.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/31.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/32.css')) . '?0");
', 'all'),
),
),
@ -422,40 +433,40 @@ class CssCollectionRendererUnitTest extends UnitTestCase {
),
array(
0 => $create_style_element('
@import url("' . file_create_url('public://css/1.css') . '?0");
@import url("' . file_create_url('public://css/2.css') . '?0");
@import url("' . file_create_url('public://css/3.css') . '?0");
@import url("' . file_create_url('public://css/4.css') . '?0");
@import url("' . file_create_url('public://css/5.css') . '?0");
@import url("' . file_create_url('public://css/6.css') . '?0");
@import url("' . file_create_url('public://css/7.css') . '?0");
@import url("' . file_create_url('public://css/8.css') . '?0");
@import url("' . file_create_url('public://css/9.css') . '?0");
@import url("' . file_create_url('public://css/10.css') . '?0");
@import url("' . file_create_url('public://css/11.css') . '?0");
@import url("' . file_create_url('public://css/12.css') . '?0");
@import url("' . file_create_url('public://css/13.css') . '?0");
@import url("' . file_create_url('public://css/14.css') . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/1.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/2.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/3.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/4.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/5.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/6.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/7.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/8.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/9.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/10.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/11.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/12.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/13.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/14.css')) . '?0");
', 'all'),
1 => $create_link_element(file_create_url('public://css/15.css') . '?0'),
1 => $create_link_element(file_url_transform_relative(file_create_url('public://css/15.css')) . '?0'),
2 => $create_style_element('
@import url("' . file_create_url('public://css/16.css') . '?0");
@import url("' . file_create_url('public://css/17.css') . '?0");
@import url("' . file_create_url('public://css/18.css') . '?0");
@import url("' . file_create_url('public://css/19.css') . '?0");
@import url("' . file_create_url('public://css/20.css') . '?0");
@import url("' . file_create_url('public://css/21.css') . '?0");
@import url("' . file_create_url('public://css/22.css') . '?0");
@import url("' . file_create_url('public://css/23.css') . '?0");
@import url("' . file_create_url('public://css/24.css') . '?0");
@import url("' . file_create_url('public://css/25.css') . '?0");
@import url("' . file_create_url('public://css/26.css') . '?0");
@import url("' . file_create_url('public://css/27.css') . '?0");
@import url("' . file_create_url('public://css/28.css') . '?0");
@import url("' . file_create_url('public://css/29.css') . '?0");
@import url("' . file_create_url('public://css/30.css') . '?0");
@import url("' . file_create_url('public://css/31.css') . '?0");
@import url("' . file_create_url('public://css/32.css') . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/16.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/17.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/18.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/19.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/20.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/21.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/22.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/23.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/24.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/25.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/26.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/27.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/28.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/29.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/30.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/31.css')) . '?0");
@import url("' . file_url_transform_relative(file_create_url('public://css/32.css')) . '?0");
', 'all'),
),
),

45
core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php
View file

@ -9,7 +9,8 @@
namespace {
/**
* CssOptimizer uses file_create_url(), which *is* available when using the
* CssOptimizer uses file_create_url(), file_uri_scheme() and
* file_url_transform_relative(), which *are* available when using the
* Simpletest test runner, but not when using the PHPUnit test runner; hence
* this hack.
*/
@ -31,6 +32,17 @@ if (!function_exists('file_uri_scheme')) {
return FALSE;
}
}
if (!function_exists('file_url_transform_relative')) {
/**
* Temporary mock of file_url_transform_relative, until that is moved into
* Component/Utility.
*/
function file_url_transform_relative($uri) {
return 'file_url_transform_relative:' . $uri;
}
}
}
@ -48,6 +60,11 @@ use Drupal\Tests\UnitTestCase;
*/
class CssOptimizerUnitTest extends UnitTestCase {
/**
* {@inheritdoc}
*/
protected $backupGlobals = FALSE;
/**
* A CSS asset optimizer.
*
@ -65,7 +82,8 @@ class CssOptimizerUnitTest extends UnitTestCase {
* Provides data for the CSS asset optimizing test.
*/
function providerTestOptimize() {
$path = dirname(__FILE__) . '/css_test_files/';
$path = 'core/tests/Drupal/Tests/Core/Asset/css_test_files/';
$absolute_path = dirname(__FILE__) . '/css_test_files/';
return array(
// File. Tests:
// - Stripped comments and white-space.
@ -82,7 +100,7 @@ class CssOptimizerUnitTest extends UnitTestCase {
'browsers' => array('IE' => TRUE, '!IE' => TRUE),
'basename' => 'css_input_without_import.css',
),
file_get_contents($path . 'css_input_without_import.css.optimized.css'),
file_get_contents($absolute_path . 'css_input_without_import.css.optimized.css'),
),
// File. Tests:
// - Proper URLs in imported files. (https://www.drupal.org/node/265719)
@ -102,7 +120,7 @@ class CssOptimizerUnitTest extends UnitTestCase {
'browsers' => array('IE' => TRUE, '!IE' => TRUE),
'basename' => 'css_input_with_import.css',
),
str_replace('url(images/icon.png)', 'url(' . file_create_url($path . 'images/icon.png') . ')', file_get_contents($path . 'css_input_with_import.css.optimized.css')),
str_replace('url(images/icon.png)', 'url(' . file_url_transform_relative(file_create_url($path . 'images/icon.png')) . ')', file_get_contents($absolute_path . 'css_input_with_import.css.optimized.css')),
),
// File. Tests:
// - Retain comment hacks.
@ -117,7 +135,7 @@ class CssOptimizerUnitTest extends UnitTestCase {
'browsers' => array('IE' => TRUE, '!IE' => TRUE),
'basename' => 'comment_hacks.css',
),
file_get_contents($path . 'comment_hacks.css.optimized.css'),
file_get_contents($absolute_path . 'comment_hacks.css.optimized.css'),
),
// File in subfolder. Tests:
// - CSS import path is properly interpreted.
@ -134,7 +152,7 @@ class CssOptimizerUnitTest extends UnitTestCase {
'browsers' => array('IE' => TRUE, '!IE' => TRUE),
'basename' => 'css_input_with_import.css',
),
str_replace('url(../images/icon.png)', 'url(' . file_create_url($path . 'images/icon.png') . ')', file_get_contents($path . 'css_subfolder/css_input_with_import.css.optimized.css')),
str_replace('url(../images/icon.png)', 'url(' . file_url_transform_relative(file_create_url($path . 'images/icon.png')) . ')', file_get_contents($absolute_path . 'css_subfolder/css_input_with_import.css.optimized.css')),
),
// File. Tests:
// - Any @charaset declaration at the beginning of a file should be
@ -150,7 +168,7 @@ class CssOptimizerUnitTest extends UnitTestCase {
'browsers' => array('IE' => TRUE, '!IE' => TRUE),
'basename' => 'charset_sameline.css',
),
file_get_contents($path . 'charset.css.optimized.css'),
file_get_contents($absolute_path . 'charset.css.optimized.css'),
),
array(
array(
@ -163,7 +181,7 @@ class CssOptimizerUnitTest extends UnitTestCase {
'browsers' => array('IE' => TRUE, '!IE' => TRUE),
'basename' => 'charset_newline.css',
),
file_get_contents($path . 'charset.css.optimized.css'),
file_get_contents($absolute_path . 'charset.css.optimized.css'),
),
array(
array(
@ -226,7 +244,18 @@ class CssOptimizerUnitTest extends UnitTestCase {
* @dataProvider providerTestOptimize
*/
function testOptimize($css_asset, $expected) {
global $base_path;
$original_base_path = $base_path;
$base_path = '/';
// \Drupal\Core\Asset\CssOptimizer::loadFile() relies on the current working
// directory being the one that is used when index.php is the entry point.
// Note: PHPUnit automatically restores the original working directory.
chdir(realpath(__DIR__ . '/../../../../../../'));
$this->assertEquals($expected, $this->optimizer->optimize($css_asset), 'Group of file CSS assets optimized correctly.');
$base_path = $original_base_path;
}
/**

46
core/tests/Drupal/Tests/Core/Menu/LocalActionManagerTest.php
View file

@ -12,6 +12,7 @@ use Drupal\Component\Plugin\Factory\FactoryInterface;
use Drupal\Core\Access\AccessManagerInterface;
use Drupal\Core\Access\AccessResult;
use Drupal\Core\Access\AccessResultForbidden;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Cache\CacheBackendInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Menu\LocalActionManager;
@ -197,6 +198,9 @@ class LocalActionManagerTest extends UnitTestCase {
),
),
array(
'#cache' => array(
'contexts' => array('route'),
),
'plugin_id_1' => array(
'#theme' => 'menu_local_action',
'#link' => array(
@ -206,6 +210,14 @@ class LocalActionManagerTest extends UnitTestCase {
),
'#access' => AccessResult::forbidden(),
'#weight' => 0,
'#cache' => array(
'contexts' => array(),
'tags' => array(),
// For back-compatibility in 8.0.x the max-age is Cache::PERMANENT
// instead of 0 for any class that does not implement
// \Drupal\Core\Cache\CacheableDependencyInterface.
'max-age' => Cache::PERMANENT,
),
),
),
);
@ -231,6 +243,9 @@ class LocalActionManagerTest extends UnitTestCase {
),
),
array(
'#cache' => array(
'contexts' => array('route'),
),
'plugin_id_1' => array(
'#theme' => 'menu_local_action',
'#link' => array(
@ -240,6 +255,11 @@ class LocalActionManagerTest extends UnitTestCase {
),
'#access' => AccessResult::forbidden(),
'#weight' => 0,
'#cache' => array(
'contexts' => array(),
'tags' => array(),
'max-age' => Cache::PERMANENT,
),
),
),
);
@ -266,6 +286,9 @@ class LocalActionManagerTest extends UnitTestCase {
),
),
array(
'#cache' => array(
'contexts' => array('route'),
),
'plugin_id_1' => array(
'#theme' => 'menu_local_action',
'#link' => array(
@ -275,6 +298,11 @@ class LocalActionManagerTest extends UnitTestCase {
),
'#access' => AccessResult::forbidden(),
'#weight' => 1,
'#cache' => array(
'contexts' => array(),
'tags' => array(),
'max-age' => Cache::PERMANENT,
),
),
'plugin_id_2' => array(
'#theme' => 'menu_local_action',
@ -285,6 +313,11 @@ class LocalActionManagerTest extends UnitTestCase {
),
'#access' => AccessResult::forbidden(),
'#weight' => 0,
'#cache' => array(
'contexts' => array(),
'tags' => array(),
'max-age' => Cache::PERMANENT,
),
),
),
);
@ -313,6 +346,9 @@ class LocalActionManagerTest extends UnitTestCase {
),
),
array(
'#cache' => array(
'contexts' => array('route'),
),
'plugin_id_1' => array(
'#theme' => 'menu_local_action',
'#link' => array(
@ -322,6 +358,11 @@ class LocalActionManagerTest extends UnitTestCase {
),
'#access' => AccessResult::forbidden(),
'#weight' => 1,
'#cache' => array(
'contexts' => array(),
'tags' => array(),
'max-age' => Cache::PERMANENT,
),
),
'plugin_id_2' => array(
'#theme' => 'menu_local_action',
@ -332,6 +373,11 @@ class LocalActionManagerTest extends UnitTestCase {
),
'#access' => AccessResult::forbidden(),
'#weight' => 0,
'#cache' => array(
'contexts' => array(),
'tags' => array(),
'max-age' => Cache::PERMANENT,
),
),
),
);

2
core/tests/Drupal/Tests/Core/Render/Element/MachineNameTest.php
View file

@ -110,7 +110,7 @@ class MachineNameTest extends UnitTestCase {
}
namespace {
namespace Drupal\Core\Render\Element {
if (!function_exists('t')) {
function t($string, array $args = []) {
return strtr($string, $args);

2
core/tests/Drupal/Tests/Core/Template/TwigSandboxTest.php
View file

@ -69,7 +69,7 @@ class TwigSandboxTest extends UnitTestCase {
* Tests that white listed classes can be extended.
*/
public function testExtendedClass() {
$this->twig->render('{{ attribute.addClass("kitten") }}', ['attribute' => new TestAttribute()]);
$this->assertEquals(' class="kitten"', $this->twig->render('{{ attribute.addClass("kitten") }}', ['attribute' => new TestAttribute()]));
}
/**

10
core/tests/Drupal/Tests/Core/UrlTest.php
View file

@ -748,6 +748,16 @@ class UrlTest extends UnitTestCase {
];
}
/**
* Tests the fromUri() method with a base: URI starting with a number.
*
* @covers ::fromUri
*/
public function testFromUriNumber() {
$url = Url::fromUri('base:2015/10/06');
$this->assertSame($url->toUriString(), 'base:/2015/10/06');
}
/**
* Tests the toUriString() method with route: URIs.
*