Verified Commit 870265ac authored by Jess's avatar Jess
Browse files

Issue #3401764 by BramDriesen, xjm, smustgrave: Replace CollegeHumor URLs and... 

Issue #3401764 by BramDriesen, xjm, smustgrave: Replace CollegeHumor URLs and logic in core test cases
parent b78c8746

core/misc/cspell/dictionary.txt

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,6 @@ cochez 
codesniffer

colgroups

colinodell

collegehumor

colonpos

colour

colspans
@@ -259,6 +258,7 @@ customly 
customrequest

cweagans

cádiz

dailymotion

databasefilename

databasename

datas

core/modules/media/tests/fixtures/oembed/providers.json

+4 −5
Original line number Diff line number Diff line
@@ -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

      }

    ]

core/modules/media/tests/fixtures/oembed/video_collegehumor.html→core/modules/media/tests/fixtures/oembed/video_dailymotion.html

+8 −0
Original line number Diff line number Diff line 
<!DOCTYPE html>

<html lang="de">

<head>

  <link rel="alternate" href="video_collegehumor.xml"

        type="application/xml+oembed" title="Let&#039;s Not Get a Drink Sometime">

  <link rel="alternate" href="video_dailymotion.xml"

        type="application/xml+oembed" title="#d8rules - Support the Rules module for Drupal 8">

</head>

<body></body>

</html>

core/modules/media/tests/fixtures/oembed/video_collegehumor.xml→core/modules/media/tests/fixtures/oembed/video_dailymotion.xml

+6 −6
Original line number Diff line number Diff line
@@ -2,15 +2,15 @@ 
<oembed>

  <type>video</type>

  <version>1.0</version>

  <title>Let's Not Get a Drink Sometime</title>

  <title>#d8rules - Support the Rules module for Drupal 8</title>

  <https/>

  <author_name>CollegeHumor</author_name>

  <author_url>http://www.collegehumor.com</author_url>

  <provider_name>CollegeHumor</provider_name>

  <provider_url>http://www.collegehumor.com</provider_url>

  <author_name>Leepchic</author_name>

  <author_url>https://www.dailymotion.com/leepchic</author_url>

  <provider_name>Dailymotion</provider_name>

  <provider_url>https://www.dailymotion.com</provider_url>

  <width>610</width>

  <height>343</height>

  <html><h1>By the power of Grayskull, CollegeHumor works!</h1>

  <html><h1>Dailymotion works!</h1>

  </html>

  <!-- The thumbnail URL does not contain a file extension, so we use

  this to test the oEmbed source plugin's thumbnail handling;

core/modules/media/tests/src/Functional/ResourceFetcherTest.php

+3 −3
Original line number Diff line number Diff line
@@ -43,9 +43,9 @@ public function providerFetchResource() { 
        'Drupal Rap Video - Schipulcon09',

      ],

      'XML resource' => [

        'video_collegehumor.xml',

        'CollegeHumor',

        "Let's Not Get a Drink Sometime",

        'video_dailymotion.xml',

        'Dailymotion',

        "#d8rules - Support the Rules module for Drupal 8",

      ],

    ];

  }