Skip to content
Snippets Groups Projects
Commit e0e68e23 authored by catch's avatar catch
Browse files

Issue #3376942 by fromme, Kingdutch, smustgrave: Replace usage of... 

Issue #3376942 by fromme, Kingdutch, smustgrave: Replace usage of generateString with generate in Media module

(cherry picked from commit 01b55ef5)
parent 41577916
No related branches found
No related tags found
20 merge requests!10663Issue #3495778: Update phpdoc in FileSaveHtaccessLoggingTest,!10451Issue #3472458 by watergate, smustgrave: CKEditor 5 show blocks label is not translated,!103032838547 Fix punctuation rules for inline label suffix colon with CSS only,!10150Issue #3467294 by quietone, nod_, smustgrave, catch, longwave: Change string...,!10130Resolve #3480321 "Second level menu",!9936Issue #3483087: Check the module:// prefix in the translation server path and replace it with the actual module path,!9933Issue #3394728 by ankondrat4: Undefined array key "#prefix" and deprecated function: explode() in Drupal\file\Element\ManagedFile::uploadAjaxCallback(),!9914Issue #3451136 by quietone, gapple, ghost of drupal past: Improve...,!9882Draft: Issue #3481777 In bulk_form ensure the triggering element is the bulk_form button,!9839Issue #3445469 by pooja_sharma, smustgrave: Add additional test coverage for...,!9815Issue #3480025: There is no way to remove entity cache items,!9757Issue #3478869 Add "All" or overview links to parent links,!9752Issue #3439910 by pooja_sharma, vensires: Fix Toolbar tests that rely on UID1's super user behavior,!9749Issue #3439910 by pooja_sharma, vensires: Fix Toolbar tests that rely on UID1's super user behavior,!9678Issue #3465132 by catch, Spokje, nod_: Show test run time by class in run-tests.sh output,!9578Issue #3304746 by scott_euser, casey, smustgrave: BigPipe cannot handle (GET)...,!9449Issue #3344041: Allow textarea widgets to be used for text (formatted) fields,!8945🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥...,!8893Resolve #3444391 "Navigation center sm logo",!8772Issue #3445909 by seanB, smustgrave, alexpott, catch: Add static caching to...
Pipeline #223133 passed
Stage: 🏗️ Build
Stage: 🪄 Lint
Hide whitespace changes
Inline Side-by-side
core/modules/media/tests/src/FunctionalJavascript/MediaDisplayTest.php
+ 1
− 1
View file @ e0e68e23
...@@ -115,7 +115,7 @@ public function testMediaDisplay(): void { ...@@ -115,7 +115,7 @@ public function testMediaDisplay(): void {
// visually hidden, and there is no link to the image file. // visually hidden, and there is no link to the image file.
/** @var \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator */ /** @var \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator */
$file_url_generator = \Drupal::service('file_url_generator'); $file_url_generator = \Drupal::service('file_url_generator');
$expected_image_src = $file_url_generator->generateString(\Drupal::token()->replace('public://styles/large/public/[date:custom:Y]-[date:custom:m]/example_1.jpeg')); $expected_image_src = $file_url_generator->generate(\Drupal::token()->replace('public://styles/large/public/[date:custom:Y]-[date:custom:m]/example_1.jpeg'))->toString();
$this->assertStringContainsString($expected_image_src, $media_image->getAttribute('src')); $this->assertStringContainsString($expected_image_src, $media_image->getAttribute('src'));
$field = $assert_session->elementExists('xpath', '/div[1]', $media_item); $field = $assert_session->elementExists('xpath', '/div[1]', $media_item);
$assert_session->elementExists('xpath', '/div[@class="visually-hidden"]', $field); $assert_session->elementExists('xpath', '/div[@class="visually-hidden"]', $field);
......
core/modules/media/tests/src/FunctionalJavascript/MediaSourceImageTest.php
+ 1
− 1
View file @ e0e68e23
...@@ -79,7 +79,7 @@ public function testMediaImageSource(): void { ...@@ -79,7 +79,7 @@ public function testMediaImageSource(): void {
$image_element = $field->find('css', 'img'); $image_element = $field->find('css', 'img');
/** @var \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator */ /** @var \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator */
$file_url_generator = \Drupal::service('file_url_generator'); $file_url_generator = \Drupal::service('file_url_generator');
$expected_image_src = $file_url_generator->generateString(\Drupal::token()->replace('public://styles/large/public/[date:custom:Y]-[date:custom:m]/example_1.jpeg')); $expected_image_src = $file_url_generator->generate(\Drupal::token()->replace('public://styles/large/public/[date:custom:Y]-[date:custom:m]/example_1.jpeg'))->toString();
$this->assertStringContainsString($expected_image_src, $image_element->getAttribute('src')); $this->assertStringContainsString($expected_image_src, $image_element->getAttribute('src'));
$assert_session->elementNotExists('css', 'a', $field); $assert_session->elementNotExists('css', 'a', $field);
......
core/modules/media/tests/src/FunctionalJavascript/MediaStandardProfileTest.php
+ 6
− 6
View file @ e0e68e23
...@@ -162,7 +162,7 @@ protected function audioTest() { ...@@ -162,7 +162,7 @@ protected function audioTest() {
$audio_element = $assert_session->elementExists('css', 'div.media--type-audio .field--name-field-media-audio-file audio > source'); $audio_element = $assert_session->elementExists('css', 'div.media--type-audio .field--name-field-media-audio-file audio > source');
/** @var \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator */ /** @var \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator */
$file_url_generator = \Drupal::service('file_url_generator'); $file_url_generator = \Drupal::service('file_url_generator');
$expected_audio_src = $file_url_generator->generateString(\Drupal::token()->replace('public://[date:custom:Y]-[date:custom:m]/' . $test_filename)); $expected_audio_src = $file_url_generator->generate(\Drupal::token()->replace('public://[date:custom:Y]-[date:custom:m]/' . $test_filename))->toString();
$this->assertSame($expected_audio_src, $audio_element->getAttribute('src')); $this->assertSame($expected_audio_src, $audio_element->getAttribute('src'));
// Assert the media name is updated through the field mapping when changing // Assert the media name is updated through the field mapping when changing
...@@ -189,7 +189,7 @@ protected function audioTest() { ...@@ -189,7 +189,7 @@ protected function audioTest() {
// Assert the audio file is present inside the media element and that its // Assert the audio file is present inside the media element and that its
// src attribute matches the updated audio file. // src attribute matches the updated audio file.
$audio_element = $assert_session->elementExists('css', 'div.media--type-audio .field--name-field-media-audio-file audio > source'); $audio_element = $assert_session->elementExists('css', 'div.media--type-audio .field--name-field-media-audio-file audio > source');
$expected_audio_src = $file_url_generator->generateString(\Drupal::token()->replace('public://[date:custom:Y]-[date:custom:m]/' . $test_filename_updated)); $expected_audio_src = $file_url_generator->generate(\Drupal::token()->replace('public://[date:custom:Y]-[date:custom:m]/' . $test_filename_updated))->toString();
$this->assertSame($expected_audio_src, $audio_element->getAttribute('src')); $this->assertSame($expected_audio_src, $audio_element->getAttribute('src'));
} }
...@@ -251,7 +251,7 @@ protected function imageTest() { ...@@ -251,7 +251,7 @@ protected function imageTest() {
$image_element = $assert_session->elementExists('css', 'div.media--type-image img'); $image_element = $assert_session->elementExists('css', 'div.media--type-image img');
/** @var \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator */ /** @var \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator */
$file_url_generator = \Drupal::service('file_url_generator'); $file_url_generator = \Drupal::service('file_url_generator');
$expected_image_src = $file_url_generator->generateString(\Drupal::token()->replace('public://styles/large/public/[date:custom:Y]-[date:custom:m]/' . $image_media_name)); $expected_image_src = $file_url_generator->generate(\Drupal::token()->replace('public://styles/large/public/[date:custom:Y]-[date:custom:m]/' . $image_media_name))->toString();
$this->assertStringContainsString($expected_image_src, $image_element->getAttribute('src')); $this->assertStringContainsString($expected_image_src, $image_element->getAttribute('src'));
$assert_session->elementExists('css', '.field--name-field-media-image .field__label.visually-hidden'); $assert_session->elementExists('css', '.field--name-field-media-image .field__label.visually-hidden');
...@@ -284,7 +284,7 @@ protected function imageTest() { ...@@ -284,7 +284,7 @@ protected function imageTest() {
// src attribute uses the large image style, the label is visually hidden, // src attribute uses the large image style, the label is visually hidden,
// and there is no link to the image file. // and there is no link to the image file.
$image_element = $assert_session->elementExists('css', 'div.media--type-image img'); $image_element = $assert_session->elementExists('css', 'div.media--type-image img');
$expected_image_src = $file_url_generator->generateString(\Drupal::token()->replace('public://styles/large/public/[date:custom:Y]-[date:custom:m]/' . $image_media_name_updated)); $expected_image_src = $file_url_generator->generate(\Drupal::token()->replace('public://styles/large/public/[date:custom:Y]-[date:custom:m]/' . $image_media_name_updated))->toString();
$this->assertStringContainsString($expected_image_src, $image_element->getAttribute('src')); $this->assertStringContainsString($expected_image_src, $image_element->getAttribute('src'));
$assert_session->elementExists('css', '.field--name-field-media-image .field__label.visually-hidden'); $assert_session->elementExists('css', '.field--name-field-media-image .field__label.visually-hidden');
$assert_session->elementNotExists('css', '.field--name-field-media-image a'); $assert_session->elementNotExists('css', '.field--name-field-media-image a');
...@@ -538,7 +538,7 @@ protected function videoTest() { ...@@ -538,7 +538,7 @@ protected function videoTest() {
$video_element = $assert_session->elementExists('css', 'div.media--type-video .field--name-field-media-video-file video > source'); $video_element = $assert_session->elementExists('css', 'div.media--type-video .field--name-field-media-video-file video > source');
/** @var \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator */ /** @var \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator */
$file_url_generator = \Drupal::service('file_url_generator'); $file_url_generator = \Drupal::service('file_url_generator');
$expected_video_src = $file_url_generator->generateString(\Drupal::token()->replace('public://[date:custom:Y]-[date:custom:m]/' . $test_filename)); $expected_video_src = $file_url_generator->generate(\Drupal::token()->replace('public://[date:custom:Y]-[date:custom:m]/' . $test_filename))->toString();
$this->assertSame($expected_video_src, $video_element->getAttribute('src')); $this->assertSame($expected_video_src, $video_element->getAttribute('src'));
// Assert the media name is updated through the field mapping when changing // Assert the media name is updated through the field mapping when changing
...@@ -565,7 +565,7 @@ protected function videoTest() { ...@@ -565,7 +565,7 @@ protected function videoTest() {
// Assert the video element is present inside the media element and that its // Assert the video element is present inside the media element and that its
// src attribute matches the updated video file. // src attribute matches the updated video file.
$video_element = $assert_session->elementExists('css', 'div.media--type-video .field--name-field-media-video-file video > source'); $video_element = $assert_session->elementExists('css', 'div.media--type-video .field--name-field-media-video-file video > source');
$expected_video_src = $file_url_generator->generateString(\Drupal::token()->replace('public://[date:custom:Y]-[date:custom:m]/' . $test_filename_updated)); $expected_video_src = $file_url_generator->generate(\Drupal::token()->replace('public://[date:custom:Y]-[date:custom:m]/' . $test_filename_updated))->toString();
$this->assertSame($expected_video_src, $video_element->getAttribute('src')); $this->assertSame($expected_video_src, $video_element->getAttribute('src'));
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment