Loosen-IT/WP-LIT-MCP
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

test: AssertsToolErrors helper for tool error assertions (T3)

Browse Source 
tests/Support/AssertsToolErrors (used by TestCase): assertToolError($result, code)
checks the WP_Error code lit_<code> and the code of the client JSON and returns the
payload; clientError() decodes the payload; errorFields() returns the fields and
asserts they exist. Replaces the private clientError() decoders of
DiviWriteAbilitiesTest/DiviReplaceTextAbilityTest, 216 single-line
assertSame('lit_…', …->get_error_code()) assertions, 24 get_error_data()['fields']
digs and two json_decode(message) reads. ErrorsTest keeps json_decode: it tests
the format itself. Tests 1404 -> 1409 (AssertsToolErrorsTest); no test has fewer
assertions.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
janniclas.loosen
2026-09-26 17:55:35 +02:00
co-authored by Claude Opus 5.5
parent 72eeaa46ad
commit 60290c85a5
50 changed files with 337 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Unit/Integrations/Divi/Design/DiviDesignSystemAbilityTest.php
+1 -1
View File
@@ -39,6 +39,6 @@ final class DiviDesignSystemAbilityTest extends TestCase
$result = (new DiviDesignSystemAbility(Mockery::mock(DesignSystemReader::class)))->permission([]);
self::assertSame('lit_forbidden', $result->get_error_code());
self::assertToolError($result, 'forbidden');
}
}
tests/Unit/Integrations/Divi/Pages/DiviContentComposerTest.php
+5 -5
View File
@@ -97,16 +97,16 @@ final class DiviContentComposerTest extends TestCase
{
$disabled = $this->composer(false)->check('post', [['type' => 'section']]);
self::assertInstanceOf(WP_Error::class, $disabled);
self::assertSame('lit_validation_failed', $disabled->get_error_code());
self::assertArrayHasKey('divi', $disabled->get_error_data()['fields']);
self::assertToolError($disabled, 'validation_failed');
self::assertArrayHasKey('divi', self::errorFields($disabled));
$invalid = $this->composer()->check('page', [
['type' => 'section', 'modules' => [['type' => 'button', 'attrs' => ['x.y' => ['desktop' => 1]]]]],
['type' => 'section', 'modules' => [['type' => 'button', 'url' => 'javascript:alert(1)', 'text' => 'x']]],
]);
self::assertInstanceOf(WP_Error::class, $invalid);
self::assertSame('lit_invalid_attr_path', $invalid->get_error_code());
$fields = $invalid->get_error_data()['fields'];
self::assertToolError($invalid, 'invalid_attr_path');
$fields = self::errorFields($invalid);
self::assertArrayHasKey('divi[0].modules[0].modules[0][0].attrs.x.y', $fields);
self::assertGreaterThanOrEqual(2, count($fields), 'every error of every section comes back');
self::assertSame([], $this->saved);
@@ -130,7 +130,7 @@ final class DiviContentComposerTest extends TestCase
$written = $this->composer(true, $registry)->write(42, 'page', $sections);
self::assertInstanceOf(WP_Error::class, $written);
self::assertSame('lit_validation_failed', $written->get_error_code());
self::assertToolError($written, 'validation_failed');
self::assertSame([], $this->saved);
}
tests/Unit/Integrations/Divi/Pages/DiviPageLoaderTest.php
+5 -5
View File
@@ -34,7 +34,7 @@ final class DiviPageLoaderTest extends TestCase
$result = (new DiviPageLoader(DiviFixtures::schema()))->load(7, false);
self::assertInstanceOf(WP_Error::class, $result);
self::assertSame('lit_unsupported', $result->get_error_code());
self::assertToolError($result, 'unsupported');
self::assertStringContainsString('Divi-4', $result->get_error_message());
}
@@ -50,7 +50,7 @@ final class DiviPageLoaderTest extends TestCase
ini_set('error_log', (string) $previous);
}
self::assertSame('lit_unsupported', $result->get_error_code());
self::assertToolError($result, 'unsupported');
self::assertStringContainsString('kein gültiges Block-Markup', $result->get_error_message());
self::assertStringContainsString('divi parse of post 7 failed', (string) file_get_contents($log));
unlink($log);
@@ -62,7 +62,7 @@ final class DiviPageLoaderTest extends TestCase
$loader = new DiviPageLoader(DiviFixtures::schema());
self::assertInstanceOf(DiviPage::class, $loader->load(7, false));
self::assertSame('lit_validation_failed', $loader->load(7, true)->get_error_code());
self::assertToolError($loader->load(7, true), 'validation_failed');
}
public function testWritableChecks(): void
@@ -70,7 +70,7 @@ final class DiviPageLoaderTest extends TestCase
$loader = new DiviPageLoader(DiviFixtures::schema(false));
DiviFixtures::givenPost('');
$empty = $loader->load(7, true);
self::assertSame('lit_unsupported', $loader->writable($empty)->get_error_code());
self::assertToolError($loader->writable($empty), 'unsupported');
$loader = new DiviPageLoader(DiviFixtures::schema());
DiviFixtures::givenPost("<!-- wp:paragraph -->\n<p>Gutenberg</p>\n<!-- /wp:paragraph -->");
@@ -81,6 +81,6 @@ final class DiviPageLoaderTest extends TestCase
DiviFixtures::givenPost('', ['post_status' => 'future', 'post_date_gmt' => '2020-01-01 00:00:00']);
$missed = $loader->load(7, true);
self::assertTrue($missed->isDiviLayout());
self::assertSame('lit_validation_failed', $loader->writable($missed)->get_error_code());
self::assertToolError($loader->writable($missed), 'validation_failed');
}
}
tests/Unit/Integrations/Divi/Pages/DiviReadAbilitiesTest.php
+3 -3
View File
@@ -65,7 +65,7 @@ final class DiviReadAbilitiesTest extends TestCase
self::assertSame(['s1', 's1.r0'], array_column($result['nodes'], 'id'));
$missing = $ability->execute(['post_id' => 7, 'id' => 's7']);
self::assertSame('lit_not_found', $missing->get_error_code());
self::assertToolError($missing, 'not_found');
self::assertStringContainsString('tree_rev', $missing->get_error_message());
}
@@ -120,7 +120,7 @@ final class DiviReadAbilitiesTest extends TestCase
DiviFixtures::givenPost(DiviFixtures::markup('synthetic-basic.html'));
$ability = new DiviNodeGetAbility(new DiviPageLoader(DiviFixtures::schema()), $this->design());
self::assertSame('lit_validation_failed', $ability->execute(['post_id' => 7, 'id' => 'hero'])->get_error_code());
self::assertSame('lit_not_found', $ability->execute(['post_id' => 7, 'id' => 's5.r0'])->get_error_code());
self::assertToolError($ability->execute(['post_id' => 7, 'id' => 'hero']), 'validation_failed');
self::assertToolError($ability->execute(['post_id' => 7, 'id' => 's5.r0']), 'not_found');
}
}
tests/Unit/Integrations/Divi/Pages/DiviReplaceTextAbilityTest.php
+10 -16
View File
@@ -107,12 +107,6 @@ final class DiviReplaceTextAbilityTest extends TestCase
return $block === null ? null : AttrMap::desktop($block->attrs(), $path);
}
/** @return array<string, mixed> */
private static function clientError(WP_Error $error): array
{
return (array) json_decode($error->get_error_message(), true);
}
public function testDryRunListsHitsWithTreeRevAndChangesNothing(): void
{
$ability = $this->ability();
@@ -177,13 +171,13 @@ final class DiviReplaceTextAbilityTest extends TestCase
{
$ability = $this->ability();
self::assertSame('lit_validation_failed', $ability->execute(['search' => 'Termin', 'replace' => 'X', 'dry_run' => false])->get_error_code());
self::assertSame('lit_validation_failed', $ability->execute([
self::assertToolError($ability->execute(['search' => 'Termin', 'replace' => 'X', 'dry_run' => false]), 'validation_failed');
self::assertToolError($ability->execute([
'search' => 'Termin', 'replace' => 'X', 'dry_run' => false, 'confirm' => true, 'targets' => [['post_id' => 7]],
])->get_error_code());
self::assertSame('lit_confirm_required', $ability->execute([
]), 'validation_failed');
self::assertToolError($ability->execute([
'search' => 'Termin', 'replace' => 'X', 'dry_run' => false, 'targets' => [['post_id' => 7, 'tree_rev' => 'abc']],
])->get_error_code());
]), 'confirm_required');
self::assertSame([], $this->saved);
}
@@ -225,9 +219,9 @@ final class DiviReplaceTextAbilityTest extends TestCase
$short = $ability->execute(['search' => 'T', 'replace' => 'X']);
$reference = $ability->execute(['search' => 'Termin', 'replace' => self::REF, 'dry_run' => false, 'confirm' => true, 'targets' => [['post_id' => 7, 'tree_rev' => 'x']]]);
self::assertSame('lit_validation_failed', $short->get_error_code());
self::assertToolError($short, 'validation_failed');
self::assertArrayHasKey('search', self::clientError($short)['fields']);
self::assertSame('lit_validation_failed', $reference->get_error_code());
self::assertToolError($reference, 'validation_failed');
self::assertArrayHasKey('replace', self::clientError($reference)['fields']);
self::assertSame([], $this->queries);
self::assertSame([], $this->saved);
@@ -357,7 +351,7 @@ final class DiviReplaceTextAbilityTest extends TestCase
self::assertSame([], $this->saved);
if ($result instanceof WP_Error) {
self::assertSame('lit_validation_failed', $result->get_error_code());
self::assertToolError($result, 'validation_failed');
self::assertInstanceOf(WP_Error::class, $dry);
return;
@@ -454,7 +448,7 @@ final class DiviReplaceTextAbilityTest extends TestCase
foreach (['', "Ter\0min", "Ter\x0Bmin"] as $search) {
$error = $ability->execute(['search' => $search, 'replace' => 'X']);
self::assertSame('lit_validation_failed', $error->get_error_code(), json_encode($search));
self::assertToolError($error, 'validation_failed', json_encode($search));
self::assertArrayHasKey('search', self::clientError($error)['fields']);
}
@@ -478,7 +472,7 @@ final class DiviReplaceTextAbilityTest extends TestCase
self::assertStringContainsString('LIMIT 3 OFFSET 0', $this->queries[0]);
self::assertStringContainsString('LIMIT 3 OFFSET 2', $this->queries[1]);
self::assertIsString($second['next_cursor'], 'the fake query returns three rows again');
self::assertSame('lit_validation_failed', $invalid->get_error_code());
self::assertToolError($invalid, 'validation_failed');
self::assertStringContainsString('LIMIT 101 OFFSET 0', $this->queries[2]);
self::assertCount(3, $capped['matches']);
}
tests/Unit/Integrations/Divi/Pages/DiviSaverTest.php
+1 -1
View File
@@ -171,7 +171,7 @@ final class DiviSaverTest extends TestCase
self::fail('WriteFailed expected');
} catch (WriteFailed $e) {
self::assertFalse($e->rolledBack);
self::assertSame('lit_partial_write', $e->toError()->get_error_code());
self::assertToolError($e->toError(), 'partial_write');
}
}
tests/Unit/Integrations/Divi/Pages/DiviWriteAbilitiesTest.php
+23 -29
View File
@@ -71,12 +71,6 @@ final class DiviWriteAbilitiesTest extends TestCase
return new DiviDuplicateNodeAbility($this->writer);
}
/** @return array<string, mixed> The structured error the client sees (message JSON, spec §8.2). */
private static function clientError(WP_Error $error): array
{
return (array) json_decode($error->get_error_message(), true);
}
public function testInsertComposesAndSavesWithTreeRevAndPostRev(): void
{
$result = $this->insert()->execute([
@@ -106,7 +100,7 @@ final class DiviWriteAbilitiesTest extends TestCase
public function testStaleTreeRevAndInvalidNodesWriteNothing(): void
{
$stale = $this->insert()->execute(['post_id' => 7, 'tree_rev' => '000000000000', 'nodes' => [['type' => 'section']]]);
self::assertSame('lit_rev_mismatch', $stale->get_error_code());
self::assertToolError($stale, 'rev_mismatch');
self::assertSame('rev_mismatch', self::clientError($stale)['code'], 'the client sees the code without lit_');
self::assertStringContainsString('lit-divi-outline', $stale->get_error_data()['hint']);
self::assertSame($stale->get_error_code(), $this->insert()->permission(['post_id' => 7, 'tree_rev' => 'x'])->get_error_code());
@@ -120,7 +114,7 @@ final class DiviWriteAbilitiesTest extends TestCase
['type' => 'button', 'url' => 'javascript:alert(1)', 'text' => 'x', 'nope' => 1],
],
]);
self::assertSame('lit_invalid_attr_path', $invalid->get_error_code());
self::assertToolError($invalid, 'invalid_attr_path');
$client = self::clientError($invalid);
self::assertSame('invalid_attr_path', $client['code']);
self::assertArrayHasKey('nodes[0].attrs.title.fnt', $client['fields']);
@@ -128,7 +122,7 @@ final class DiviWriteAbilitiesTest extends TestCase
self::assertStringContainsString('lit-divi-catalog', $client['hint']);
$wrongPlace = $this->insert()->execute(['post_id' => 7, 'tree_rev' => $this->treeRev(), 'nodes' => [['type' => 'button']]]);
self::assertSame('lit_validation_failed', $wrongPlace->get_error_code());
self::assertToolError($wrongPlace, 'validation_failed');
$badPosition = $this->insert()->execute([
'post_id' => 7,
@@ -137,7 +131,7 @@ final class DiviWriteAbilitiesTest extends TestCase
'after' => 's0.r0.c1.m1',
'nodes' => [['type' => 'text']],
]);
self::assertSame('lit_validation_failed', $badPosition->get_error_code());
self::assertToolError($badPosition, 'validation_failed');
self::assertArrayHasKey('position', self::clientError($badPosition)['fields']);
$unknown = $this->insert()->execute([
@@ -146,7 +140,7 @@ final class DiviWriteAbilitiesTest extends TestCase
'parent' => 's9',
'nodes' => [['type' => 'section']],
]);
self::assertSame('lit_validation_failed', $unknown->get_error_code());
self::assertToolError($unknown, 'validation_failed');
self::assertSame([], $this->saved);
self::assertSame($this->original, $this->post->post_content);
}
@@ -177,7 +171,7 @@ final class DiviWriteAbilitiesTest extends TestCase
['id' => 's0.r0.c1.m0', 'set' => ['level' => 'h9']],
['id' => 's0.r0.c1.m9', 'label' => 'x'],
]]);
self::assertSame('lit_validation_failed', $failed->get_error_code());
self::assertToolError($failed, 'validation_failed');
$fields = self::clientError($failed)['fields'];
self::assertArrayHasKey('changes[1].set.level', $fields);
self::assertArrayHasKey('changes[2].id', $fields, 'every error of the call in one response (S39)');
@@ -220,7 +214,7 @@ final class DiviWriteAbilitiesTest extends TestCase
'changes' => [['id' => 's0.r0.c1.m2', 'label' => 'x']],
]);
self::assertSame('lit_rev_mismatch', $result->get_error_code());
self::assertToolError($result, 'rev_mismatch');
self::assertSame([], $this->saved);
}
@@ -251,14 +245,14 @@ final class DiviWriteAbilitiesTest extends TestCase
$intoSection = $this->move()->execute([
'post_id' => 7, 'tree_rev' => $treeRev, 'id' => 's0.c0.m0', 'parent' => 's1',
]);
self::assertSame('lit_validation_failed', $intoSection->get_error_code());
self::assertToolError($intoSection, 'validation_failed');
self::assertStringContainsString('Zeilen (row)', self::clientError($intoSection)['fields']['position']);
// s0.c1 is a specialty column (specialtyColumns set, holds a row-inner): refuses every child.
$intoSpecialtyColumn = $this->move()->execute([
'post_id' => 7, 'tree_rev' => $treeRev, 'id' => 's0.c0.m0', 'parent' => 's0.c1',
]);
self::assertSame('lit_validation_failed', $intoSpecialtyColumn->get_error_code());
self::assertToolError($intoSpecialtyColumn, 'validation_failed');
self::assertStringContainsString('Spezialspalten', self::clientError($intoSpecialtyColumn)['fields']['position']);
self::assertSame([], $this->saved);
@@ -271,7 +265,7 @@ final class DiviWriteAbilitiesTest extends TestCase
'post_id' => 7, 'tree_rev' => $this->treeRev(), 'id' => 's0', 'parent' => 's0.r0.c1',
]);
self::assertSame('lit_validation_failed', $result->get_error_code());
self::assertToolError($result, 'validation_failed');
self::assertStringContainsString(
'nicht in sich selbst verschoben',
self::clientError($result)['fields']['position']
@@ -285,7 +279,7 @@ final class DiviWriteAbilitiesTest extends TestCase
'post_id' => 7, 'tree_rev' => '000000000000', 'id' => 's0.r0.c1.m2', 'parent' => 's1.r0.c0',
]);
self::assertSame('lit_rev_mismatch', $result->get_error_code());
self::assertToolError($result, 'rev_mismatch');
self::assertSame('rev_mismatch', self::clientError($result)['code'], 'the client sees the code without lit_');
self::assertSame([], $this->saved);
}
@@ -349,7 +343,7 @@ final class DiviWriteAbilitiesTest extends TestCase
'post_id' => 7, 'tree_rev' => $this->treeRev(), 'ids' => ['s9'], 'confirm' => true,
]);
self::assertSame('lit_not_found', $result->get_error_code());
self::assertToolError($result, 'not_found');
self::assertSame('not_found', self::clientError($result)['code']);
self::assertSame([], $this->saved);
}
@@ -371,10 +365,10 @@ final class DiviWriteAbilitiesTest extends TestCase
$delete = $this->delete();
$ask = $delete->execute(['post_id' => 7, 'tree_rev' => Rev::of($this->saved[0]), 'ids' => ['s2', 's2.r0']]);
self::assertSame('lit_confirm_required', $ask->get_error_code());
self::assertToolError($ask, 'confirm_required');
self::assertSame(
'1 Divi-Knoten würden samt Inhalt entfernt: s2 section "Leistungen (Kopie)" (1 Kind-Knoten).',
json_decode($ask->get_error_message(), true)['message']
self::clientError($ask)['message']
);
$deleted = $delete->execute(['post_id' => 7, 'tree_rev' => Rev::of($this->saved[0]), 'ids' => ['s2'], 'confirm' => true]);
@@ -490,7 +484,7 @@ final class DiviWriteAbilitiesTest extends TestCase
foreach ([$this->move(), $this->delete(), $this->duplicate()] as $ability) {
$result = $ability->permission(['post_id' => 7, 'tree_rev' => $this->treeRev()]);
self::assertInstanceOf(WP_Error::class, $result, $ability->name());
self::assertSame('lit_forbidden', $result->get_error_code(), $ability->name());
self::assertToolError($result, 'forbidden', $ability->name());
}
self::assertSame([], $this->saved);
}
@@ -505,7 +499,7 @@ final class DiviWriteAbilitiesTest extends TestCase
'changes' => [['id' => 's1.g1', 'label' => 'x']],
]);
self::assertSame('lit_validation_failed', $result->get_error_code());
self::assertToolError($result, 'validation_failed');
self::assertStringContainsString('nur lesbar', $result->get_error_message());
self::assertSame([], $this->saved);
}
@@ -518,7 +512,7 @@ final class DiviWriteAbilitiesTest extends TestCase
['id' => 's0.r0.c1.m2', 'set' => ['url' => '/zwei']],
]]);
self::assertSame('lit_validation_failed', $result->get_error_code());
self::assertToolError($result, 'validation_failed');
self::assertStringContainsString('changes[0]', self::clientError($result)['fields']['changes[1].id']);
self::assertSame([], $this->saved);
}
@@ -532,7 +526,7 @@ final class DiviWriteAbilitiesTest extends TestCase
'attrs' => ['button.innerContent' => ['desktop' => ['linkUrl' => '/neu']]],
]]]);
self::assertSame('lit_validation_failed', $result->get_error_code());
self::assertToolError($result, 'validation_failed');
self::assertArrayHasKey('changes[0].attrs.button.innerContent', self::clientError($result)['fields']);
self::assertSame([], $this->saved);
}
@@ -551,7 +545,7 @@ final class DiviWriteAbilitiesTest extends TestCase
]],
]);
self::assertSame('lit_validation_failed', $result->get_error_code());
self::assertToolError($result, 'validation_failed');
self::assertArrayHasKey('nodes[0].attrs.button.innerContent', self::clientError($result)['fields']);
self::assertSame([], $this->saved);
}
@@ -564,7 +558,7 @@ final class DiviWriteAbilitiesTest extends TestCase
$broken = $this->update()->execute(['post_id' => 7, 'tree_rev' => $this->treeRev(), 'changes' => [
['id' => 's0.r0.c0', 'attrs' => $sizing('12_24')],
]]);
self::assertSame('lit_validation_failed', $broken->get_error_code());
self::assertToolError($broken, 'validation_failed');
self::assertArrayHasKey('changes[0].attrs.module.decoration.sizing', self::clientError($broken)['fields']);
self::assertSame([], $this->saved);
@@ -636,9 +630,9 @@ final class DiviWriteAbilitiesTest extends TestCase
public function testUpdateKeepsExactRowsStrict(): void
{
$broken = $this->updateOn($this->original, [['id' => 's0.r0.c0', 'attrs' => self::sizing(null)]]);
self::assertSame('lit_validation_failed', $broken->get_error_code());
self::assertToolError($broken, 'validation_failed');
$broken = $this->updateOn($this->original, [['id' => 's0.r0.c0', 'attrs' => self::sizing('10_24')]]);
self::assertSame('lit_validation_failed', $broken->get_error_code());
self::assertToolError($broken, 'validation_failed');
self::assertSame([], $this->saved);
}
@@ -650,7 +644,7 @@ final class DiviWriteAbilitiesTest extends TestCase
'attrs' => ['module.decoration.attributes' => ['desktop' => ['attributes' => [['name' => 'onclick', 'value' => 'x']]]]],
]]]);
self::assertSame('lit_validation_failed', $result->get_error_code());
self::assertToolError($result, 'validation_failed');
$client = self::clientError($result);
self::assertSame('validation_failed', $client['code']);
self::assertStringContainsString('nur im Divi-Builder', $client['fields']['changes[0].attrs.module.decoration.attributes']);
tests/Unit/Integrations/Divi/Pages/DiviWriterTest.php
+3 -3
View File
@@ -54,9 +54,9 @@ final class DiviWriterTest extends TestCase
$writer = $this->writer(Mockery::mock(DiviSaver::class), FakeChangeLog::forbidden());
self::assertInstanceOf(DiviPage::class, $writer->page(['post_id' => 7, 'tree_rev' => Rev::of($content)]));
self::assertSame('lit_rev_mismatch', $writer->page(['post_id' => 7])->get_error_code());
self::assertToolError($writer->page(['post_id' => 7]), 'rev_mismatch');
$stale = $writer->page(['post_id' => 7, 'tree_rev' => Rev::ofPost(DiviFixtures::givenPost($content))]);
self::assertSame('lit_rev_mismatch', $stale->get_error_code(), 'the post rev is no tree_rev');
self::assertToolError($stale, 'rev_mismatch', 'the post rev is no tree_rev');
self::assertStringContainsString('nichts wurde', $stale->get_error_message());
}
@@ -72,7 +72,7 @@ final class DiviWriterTest extends TestCase
Mockery::mock(DiviComposition::class)
);
self::assertSame('lit_unsupported', $writer->page(['post_id' => 7, 'tree_rev' => Rev::of($content)])->get_error_code());
self::assertToolError($writer->page(['post_id' => 7, 'tree_rev' => Rev::of($content)]), 'unsupported');
}
public function testSectionLabelOfANode(): void
tests/Unit/Integrations/Divi/Schema/DiviCatalogAbilityTest.php
+2 -2
View File
@@ -78,10 +78,10 @@ final class DiviCatalogAbilityTest extends TestCase
public function testUnknownModuleAndPermission(): void
{
self::assertSame('lit_not_found', $this->ability()->execute(['module' => 'slider-pro'])->get_error_code());
self::assertToolError($this->ability()->execute(['module' => 'slider-pro']), 'not_found');
Functions\when('current_user_can')->justReturn(false);
self::assertSame('lit_forbidden', $this->ability()->permission([])->get_error_code());
self::assertToolError($this->ability()->permission([]), 'forbidden');
self::assertTrue($this->ability()->annotations()['readonly']);
self::assertTrue($this->ability()->isDirect());
}