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

2
core/modules/system/src/Tests/Theme/EngineTwigTest.php
View file

@ -125,7 +125,7 @@ class EngineTwigTest extends WebTestBase {
*/
public function testTwigFileUrls() {
$this->drupalGet('/twig-theme-test/file-url');
$filepath = file_create_url('core/modules/system/tests/modules/twig_theme_test/twig_theme_test.js');
$filepath = file_url_transform_relative(file_create_url('core/modules/system/tests/modules/twig_theme_test/twig_theme_test.js'));
$this->assertRaw('<div>file_url: ' . $filepath . '</div>');
}

19
core/modules/system/src/Tests/Theme/ImageTest.php
View file

@ -8,6 +8,7 @@
namespace Drupal\system\Tests\Theme;
use Drupal\simpletest\KernelTestBase;
use Symfony\Component\HttpFoundation\Request;
/**
* Tests built-in image theme functions.
@ -32,9 +33,17 @@ class ImageTest extends KernelTestBase {
protected function setUp() {
parent::setUp();
// The code under test uses file_url_transform_relative(), which relies on
// the Request containing the correct hostname. KernelTestBase doesn't set
// it, so push another request onto the stack to ensure it's correct.
$request = Request::create('/', 'GET', [], [], [], $_SERVER);
$this->container = $this->kernel->getContainer();
$this->container->get('request_stack')->push($request);
$this->testImages = array(
'/core/misc/druplicon.png',
'/core/misc/loading.gif',
'core/misc/druplicon.png',
'core/misc/loading.gif',
);
}
@ -75,7 +84,7 @@ class ImageTest extends KernelTestBase {
$this->render($image);
// Make sure the src attribute has the correct value.
$this->assertRaw(file_create_url($image['#uri']), 'Correct output for an image with the src attribute.');
$this->assertRaw(file_url_transform_relative(file_create_url($image['#uri'])), 'Correct output for an image with the src attribute.');
}
/**
@ -103,7 +112,7 @@ class ImageTest extends KernelTestBase {
$this->render($image);
// Make sure the srcset attribute has the correct value.
$this->assertRaw(file_create_url($this->testImages[0]) . ' 1x, ' . file_create_url($this->testImages[1]) . ' 2x', 'Correct output for image with srcset attribute and multipliers.');
$this->assertRaw(file_url_transform_relative(file_create_url($this->testImages[0])) . ' 1x, ' . file_url_transform_relative(file_create_url($this->testImages[1])) . ' 2x', 'Correct output for image with srcset attribute and multipliers.');
}
/**
@ -135,7 +144,7 @@ class ImageTest extends KernelTestBase {
$this->render($image);
// Make sure the srcset attribute has the correct value.
$this->assertRaw(file_create_url($this->testImages[0]) . ' ' . $widths[0] . ', ' . file_create_url($this->testImages[1]) . ' ' . $widths[1], 'Correct output for image with srcset attribute and width descriptors.');
$this->assertRaw(file_url_transform_relative(file_create_url($this->testImages[0])) . ' ' . $widths[0] . ', ' . file_url_transform_relative(file_create_url($this->testImages[1])) . ' ' . $widths[1], 'Correct output for image with srcset attribute and width descriptors.');
}
}