Skip to content

Commit

Permalink
Corrected test for external link
Browse files Browse the repository at this point in the history
  • Loading branch information
mateuszdebinski committed Sep 19, 2023
1 parent 454e5cc commit 9ce41d7
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 12 deletions.
7 changes: 5 additions & 2 deletions phpstan-baseline.neon
Original file line number Diff line number Diff line change
Expand Up @@ -1662,9 +1662,12 @@ parameters:

-
message: "#^Cannot access property \\$id on eZ\\\\Publish\\\\API\\\\Repository\\\\Values\\\\Content\\\\Field\\|null\\.$#"
count: 2
count: 1
path: tests/integration/eZ/API/RichTextFieldTypeIntegrationTest.php
-
message: "#^Cannot call method fetchOne\\(\\) on Doctrine\\\\DBAL\\\\ForwardCompatibility\\\\Result\\|int\\|string\\.$#"
count: 1
path: tests/integration/eZ/API/RichTextFieldTypeIntegrationTest.php

-
message: "#^Cannot access property \\$value on eZ\\\\Publish\\\\API\\\\Repository\\\\Values\\\\Content\\\\Field\\|null\\.$#"
count: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ protected function getTemplateNodeDefinition($info, $example)
return $templateNodeDefinition;
}

public function mapConfig(array &$scopeSettings, $currentScope, ContextualizerInterface $contextualizer)
public function mapConfig(array & $scopeSettings, $currentScope, ContextualizerInterface $contextualizer)
{
if (!empty($scopeSettings['fieldtypes'])) {
// Workaround to be able to use Contextualizer::mapConfigArray() which only supports first level entries.
Expand Down
46 changes: 37 additions & 9 deletions tests/integration/eZ/API/RichTextFieldTypeIntegrationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
use eZ\Publish\API\Repository\Tests\FieldType\RelationSearchBaseIntegrationTestTrait;
use eZ\Publish\API\Repository\Tests\FieldType\SearchBaseIntegrationTest;
use eZ\Publish\API\Repository\Values\Content\Location;
use eZ\Publish\Core\Base\Exceptions\NotFoundException;
use EzSystems\EzPlatformRichText\eZ\FieldType\RichText\Value as RichTextValue;
use eZ\Publish\API\Repository\Values\Content\Field;
use DOMDocument;
Expand Down Expand Up @@ -643,7 +644,8 @@ public function testConvertRemoteObjectIdToObjectId($test, $expected): void
*/
public function testExternalLinkStoringAfterUpdate(): void
{
$xmlDocument = $this->createXmlDocumentWithExternalLink(['https://ez.no/', 'https://support.ez.no/']);
$testLink = 'https://support.ez.no/';
$xmlDocument = $this->createXmlDocumentWithExternalLink(['https://ez.no/', $testLink]);
$repository = $this->getRepository();
$contentService = $repository->getContentService();

Expand All @@ -663,12 +665,8 @@ public function testExternalLinkStoringAfterUpdate(): void
$content = $contentService->publishVersion(
$content->versionInfo
);
$urlIds = $this->getUrlIdsForContentObjectAttributeIdAndVersionNo(
$content->getField('description')->id,
$content->contentInfo->currentVersionNo
);

$xmlDocument = $this->createXmlDocumentWithExternalLink(['https://support.ez.no/']);
$xmlDocument = $this->createXmlDocumentWithExternalLink([$testLink]);
$contentUpdateStruct = $contentService->newContentUpdateStruct();
$contentUpdateStruct->setField('description', $xmlDocument, 'eng-GB');
$contentDraft = $contentService->updateContent(
Expand All @@ -681,7 +679,37 @@ public function testExternalLinkStoringAfterUpdate(): void
$content->contentInfo->currentVersionNo
);

$this->assertNotContains(reset($urlIds), $urlIdsAfterUpdate);
$urlId = $this->getUrlIdForLink($testLink);

$this->assertContains($urlId, $urlIdsAfterUpdate);
}

/**
* @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
* @throws \Doctrine\DBAL\Driver\Exception
* @throws \Doctrine\DBAL\Exception
* @throws \ErrorException
*/
private function getUrlIdForLink(string $link): int
{
$connection = $this->getRawDatabaseConnection();
$query = $connection->createQueryBuilder();
$query
->select(
$connection->quoteIdentifier('id')
)
->from('ezurl')
->where('url = :url')
->setParameter(':url', $link, ParameterType::STRING)
;

$id = $query->execute()->fetchOne();

if ($id === false) {
throw new NotFoundException('ezurl', $link);
}

return (int)$id;
}

/**
Expand Down Expand Up @@ -911,7 +939,7 @@ public function testInternalLinkValidatorIgnoresMissingRelationOnNotUpdatedField
$repository = $this->getRepository();
$contentService = $repository->getContentService();

list(, $contentB) = $this->prepareInternalLinkValidatorBrokenLinksTestCase($repository);
[, $contentB] = $this->prepareInternalLinkValidatorBrokenLinksTestCase($repository);

// update field w/o erroneous link to trigger validation
$contentUpdateStruct = $contentService->newContentUpdateStruct();
Expand Down Expand Up @@ -939,7 +967,7 @@ public function testInternalLinkValidatorReturnsErrorOnMissingRelationInUpdatedF
$repository = $this->getRepository();
$contentService = $repository->getContentService();

list($deletedLocation, $brokenContent) = $this->prepareInternalLinkValidatorBrokenLinksTestCase(
[$deletedLocation, $brokenContent] = $this->prepareInternalLinkValidatorBrokenLinksTestCase(
$repository
);

Expand Down

0 comments on commit 9ce41d7

Please sign in to comment.