From 8087bc588d5d5be2de7569226cc2d7eacfdc0d25 Mon Sep 17 00:00:00 2001 From: xjm Date: Thu, 16 Nov 2023 12:09:54 -0600 Subject: [PATCH] Issue #3401764 by BramDriesen, xjm, smustgrave: Replace CollegeHumor URLs and logic in core test cases --- core/misc/cspell/dictionary.txt | 2 +- .../media/tests/fixtures/oembed/providers.json | 9 ++++----- .../tests/fixtures/oembed/video_collegehumor.html | 8 -------- .../tests/fixtures/oembed/video_dailymotion.html | 8 ++++++++ ...deo_collegehumor.xml => video_dailymotion.xml} | 12 ++++++------ .../tests/src/Functional/ResourceFetcherTest.php | 6 +++--- .../tests/src/Functional/UrlResolverTest.php | 15 +++++---------- .../MediaSourceOEmbedVideoTest.php | 14 +++++++------- 8 files changed, 34 insertions(+), 40 deletions(-) delete mode 100644 core/modules/media/tests/fixtures/oembed/video_collegehumor.html create mode 100644 core/modules/media/tests/fixtures/oembed/video_dailymotion.html rename core/modules/media/tests/fixtures/oembed/{video_collegehumor.xml => video_dailymotion.xml} (64%) diff --git a/core/misc/cspell/dictionary.txt b/core/misc/cspell/dictionary.txt index ffd89e9c0b2..3938e3048b9 100644 --- a/core/misc/cspell/dictionary.txt +++ b/core/misc/cspell/dictionary.txt @@ -170,7 +170,6 @@ cnenzrgre codesniffer colgroups colinodell -collegehumor colonpos colour colspans @@ -211,6 +210,7 @@ customly customrequest cweagans cádiz +dailymotion databasename datas datelist diff --git a/core/modules/media/tests/fixtures/oembed/providers.json b/core/modules/media/tests/fixtures/oembed/providers.json index 9791d7378dc..9988ac1f1aa 100644 --- a/core/modules/media/tests/fixtures/oembed/providers.json +++ b/core/modules/media/tests/fixtures/oembed/providers.json @@ -27,19 +27,18 @@ "https:\/\/*.twitter.com\/*\/status\/*" ], "url": "https:\/\/publish.twitter.com\/oembed" - } ] }, { - "provider_name": "CollegeHumor", - "provider_url": "http:\/\/www.collegehumor.com\/", + "provider_name": "Dailymotion", + "provider_url": "https:\/\/www.dailymotion.com\/", "endpoints": [ { "schemes": [ - "http:\/\/www.collegehumor.com\/video\/*" + "https:\/\/www.dailymotion.com\/video\/*" ], - "url": "http:\/\/www.collegehumor.com\/oembed.{format}", + "url": "https:\/\/www.dailymotion.com\/services\/oembed", "discovery": true } ] diff --git a/core/modules/media/tests/fixtures/oembed/video_collegehumor.html b/core/modules/media/tests/fixtures/oembed/video_collegehumor.html deleted file mode 100644 index fc2fdfba524..00000000000 --- a/core/modules/media/tests/fixtures/oembed/video_collegehumor.html +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/core/modules/media/tests/fixtures/oembed/video_dailymotion.html b/core/modules/media/tests/fixtures/oembed/video_dailymotion.html new file mode 100644 index 00000000000..b8ca7fe64c7 --- /dev/null +++ b/core/modules/media/tests/fixtures/oembed/video_dailymotion.html @@ -0,0 +1,8 @@ + + + + + + + diff --git a/core/modules/media/tests/fixtures/oembed/video_collegehumor.xml b/core/modules/media/tests/fixtures/oembed/video_dailymotion.xml similarity index 64% rename from core/modules/media/tests/fixtures/oembed/video_collegehumor.xml rename to core/modules/media/tests/fixtures/oembed/video_dailymotion.xml index 6a622ee765e..14ce13b88b4 100644 --- a/core/modules/media/tests/fixtures/oembed/video_collegehumor.xml +++ b/core/modules/media/tests/fixtures/oembed/video_dailymotion.xml @@ -2,15 +2,15 @@ video 1.0 - Let's Not Get a Drink Sometime + #d8rules - Support the Rules module for Drupal 8 - CollegeHumor - http://www.collegehumor.com - CollegeHumor - http://www.collegehumor.com + Leepchic + https://www.dailymotion.com/leepchic + Dailymotion + https://www.dailymotion.com 610 343 -

CollegeHumor works!

+

Dailymotion works!