Fixed merge conflicts

This commit is contained in:
Alejandro Celaya
2022-06-04 11:43:02 +02:00
5 changed files with 48 additions and 11 deletions

View File

@@ -128,7 +128,7 @@ class UrlValidatorTest extends TestCase
$result = $this->urlValidator->validateUrlWithTitle('http://foobar.com/12345/hello?foo=bar', true);
self::assertEquals('Resolved title', $result);
self::assertEquals('Resolved "title"', $result);
$request->shouldHaveBeenCalledOnce();
}
@@ -162,7 +162,7 @@ class UrlValidatorTest extends TestCase
private function respWithTitle(): Response
{
$body = $this->createStreamWithContent('<title data-foo="bar"> Resolved title</title>');
$body = $this->createStreamWithContent('<title data-foo="bar"> Resolved &quot;title&quot; </title>');
return new Response($body, 200, ['Content-Type' => 'TEXT/html; charset=utf-8']);
}