diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageDimensionsTest.php b/core/modules/image/lib/Drupal/image/Tests/ImageDimensionsTest.php index 4a8de37..f609590 100644 --- a/core/modules/image/lib/Drupal/image/Tests/ImageDimensionsTest.php +++ b/core/modules/image/lib/Drupal/image/Tests/ImageDimensionsTest.php @@ -71,7 +71,7 @@ public function testImageDimensions() { ); $style->saveImageEffect($effect); - $this->assertEqual($this->getImageTag($variables), '' . "\n"); + $this->assertEqual($this->getImageTag($variables), ''); $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.'); $this->drupalGet($url); $this->assertResponse(200, 'Image was generated at the URL.'); @@ -91,7 +91,7 @@ public function testImageDimensions() { ); $style->saveImageEffect($effect); - $this->assertEqual($this->getImageTag($variables), '' . "\n"); + $this->assertEqual($this->getImageTag($variables), ''); $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.'); $this->drupalGet($url); $this->assertResponse(200, 'Image was generated at the URL.'); @@ -112,7 +112,7 @@ public function testImageDimensions() { ); $style->saveImageEffect($effect); - $this->assertEqual($this->getImageTag($variables), '' . "\n"); + $this->assertEqual($this->getImageTag($variables), ''); $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.'); $this->drupalGet($url); $this->assertResponse(200, 'Image was generated at the URL.'); @@ -133,7 +133,7 @@ public function testImageDimensions() { ); $style->saveImageEffect($effect); - $this->assertEqual($this->getImageTag($variables), '' . "\n"); + $this->assertEqual($this->getImageTag($variables), ''); $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.'); $this->drupalGet($url); $this->assertResponse(200, 'Image was generated at the URL.'); @@ -150,7 +150,7 @@ public function testImageDimensions() { ); $style->saveImageEffect($effect); - $this->assertEqual($this->getImageTag($variables), '' . "\n"); + $this->assertEqual($this->getImageTag($variables), ''); $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.'); $this->drupalGet($url); $this->assertResponse(200, 'Image was generated at the URL.'); @@ -170,7 +170,7 @@ public function testImageDimensions() { ); $style->saveImageEffect($effect); - $this->assertEqual($this->getImageTag($variables), '' . "\n"); + $this->assertEqual($this->getImageTag($variables), ''); $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.'); $this->drupalGet($url); $this->assertResponse(200, 'Image was generated at the URL.'); @@ -189,7 +189,7 @@ public function testImageDimensions() { ); $style->saveImageEffect($effect); - $this->assertEqual($this->getImageTag($variables), '' . "\n"); + $this->assertEqual($this->getImageTag($variables), ''); $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.'); $this->drupalGet($url); $this->assertResponse(200, 'Image was generated at the URL.'); @@ -209,7 +209,7 @@ public function testImageDimensions() { ); $effect_id = $style->saveImageEffect($effect); - $this->assertEqual($this->getImageTag($variables), '' . "\n"); + $this->assertEqual($this->getImageTag($variables), ''); $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.'); $this->drupalGet($url); $this->assertResponse(200, 'Image was generated at the URL.'); @@ -227,7 +227,7 @@ public function testImageDimensions() { ); $style->saveImageEffect($effect); - $this->assertEqual($this->getImageTag($variables), '' . "\n"); + $this->assertEqual($this->getImageTag($variables), ''); } /** diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php index 8438bc2..5f4efe0 100644 --- a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php +++ b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php @@ -65,7 +65,7 @@ function _testImageFieldFormatters($scheme) { '#width' => 40, '#height' => 20, ); - $default_output = drupal_render($image); + $default_output = str_replace("\n", NULL, drupal_render($image)); $this->assertRaw($default_output, 'Default formatter displaying correctly on full node view.'); // Test the image linked to file formatter. @@ -84,6 +84,7 @@ function _testImageFieldFormatters($scheme) { '#height' => 20, ); $default_output = l($image, file_create_url($image_uri), array('html' => TRUE)); + $default_output = str_replace("\n", NULL, $default_output); $this->drupalGet('node/' . $nid); $this->assertRaw($default_output, 'Image linked to file formatter displaying correctly on full node view.'); // Verify that the image can be downloaded. @@ -212,7 +213,7 @@ function testImageFieldSettings() { $field_name . '[0][title]' => $image['#title'], ); $this->drupalPostForm('node/' . $nid . '/edit', $edit, t('Save and keep published')); - $default_output = drupal_render($image); + $default_output = str_replace("\n", NULL, drupal_render($image)); $this->assertRaw($default_output, 'Image displayed using user supplied alt and title attributes.'); // Verify that alt/title longer than allowed results in a validation error. @@ -286,7 +287,7 @@ function testImageFieldDefaultImage() { '#width' => 40, '#height' => 20, ); - $default_output = drupal_render($image); + $default_output = str_replace("\n", NULL, drupal_render($image)); $this->drupalGet('node/' . $node->id()); $this->assertRaw($default_output, 'Default image displayed when no user supplied image is present.'); @@ -300,7 +301,7 @@ function testImageFieldDefaultImage() { '#width' => 40, '#height' => 20, ); - $image_output = drupal_render($image); + $image_output = str_replace("\n", NULL, drupal_render($image)); $this->drupalGet('node/' . $nid); $this->assertNoRaw($default_output, 'Default image is not displayed when user supplied image is present.'); $this->assertRaw($image_output, 'User supplied image is displayed.'); @@ -345,7 +346,7 @@ function testImageFieldDefaultImage() { '#width' => 40, '#height' => 20, ); - $default_output = drupal_render($image); + $default_output = str_replace("\n", NULL, drupal_render($image)); $this->drupalGet('node/' . $node->id()); $this->assertRaw($default_output, 'Default private image displayed when no user supplied image is present.'); } diff --git a/core/modules/responsive_image/lib/Drupal/responsive_image/Tests/ResponsiveImageFieldDisplayTest.php b/core/modules/responsive_image/lib/Drupal/responsive_image/Tests/ResponsiveImageFieldDisplayTest.php index c643774..74b24d4 100644 --- a/core/modules/responsive_image/lib/Drupal/responsive_image/Tests/ResponsiveImageFieldDisplayTest.php +++ b/core/modules/responsive_image/lib/Drupal/responsive_image/Tests/ResponsiveImageFieldDisplayTest.php @@ -129,7 +129,7 @@ public function _testResponsiveImageFieldFormatters($scheme) { '#width' => 40, '#height' => 20, ); - $default_output = drupal_render($image); + $default_output = str_replace("\n", NULL, drupal_render($image)); $this->assertRaw($default_output, 'Default formatter displaying correctly on full node view.'); // Use the responsive image formatter linked to file formatter. @@ -149,6 +149,7 @@ public function _testResponsiveImageFieldFormatters($scheme) { '#height' => 20, ); $default_output = l($image, file_create_url($image_uri), array('html' => TRUE)); + $default_output = str_replace("\n", NULL, $default_output); $this->drupalGet('node/' . $nid); $this->assertRaw($default_output, 'Image linked to file formatter displaying correctly on full node view.'); // Verify that the image can be downloaded.