test: AssertsToolErrors helper for tool error assertions (T3)
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:
@@ -50,10 +50,10 @@ final class MenuAssignLocationAbilityTest extends TestCase
|
||||
$result = (new MenuAssignLocationAbility(FakeChangeLog::forbidden()))
|
||||
->execute(['location' => 'primary-menu', 'menu_id' => 0]);
|
||||
|
||||
self::assertSame('lit_confirm_required', $result->get_error_code());
|
||||
self::assertToolError($result, 'confirm_required');
|
||||
self::assertStringContainsString(
|
||||
'"Hauptmenü" (ID 3)',
|
||||
json_decode($result->get_error_message(), true)['message']
|
||||
self::clientError($result)['message']
|
||||
);
|
||||
}
|
||||
|
||||
@@ -104,7 +104,7 @@ final class MenuAssignLocationAbilityTest extends TestCase
|
||||
$result = (new MenuAssignLocationAbility(FakeChangeLog::forbidden()))
|
||||
->execute(['location' => 'primary-menu', 'menu_id' => 99]);
|
||||
|
||||
self::assertSame('lit_not_found', $result->get_error_code());
|
||||
self::assertToolError($result, 'not_found');
|
||||
}
|
||||
|
||||
public function testPermissionNeedsThemeOptionRights(): void
|
||||
@@ -114,7 +114,7 @@ final class MenuAssignLocationAbilityTest extends TestCase
|
||||
$ability = new MenuAssignLocationAbility(FakeChangeLog::forbidden());
|
||||
$input = ['location' => 'primary-menu', 'menu_id' => 8];
|
||||
|
||||
self::assertSame('lit_forbidden', $ability->permission($input)->get_error_code());
|
||||
self::assertToolError($ability->permission($input), 'forbidden');
|
||||
}
|
||||
|
||||
public function testIsDestructiveBecauseItReplacesTheMenuOfTheLocation(): void
|
||||
|
||||
@@ -20,7 +20,7 @@ final class MenuCreateAbilityTest extends TestCase
|
||||
$ability = new MenuCreateAbility(FakeChangeLog::forbidden());
|
||||
$result = $ability->execute(['name' => 'Neu', 'location' => 'nope']);
|
||||
|
||||
self::assertSame('lit_validation_failed', $result->get_error_code());
|
||||
self::assertToolError($result, 'validation_failed');
|
||||
self::assertStringContainsString('primary-menu', $result->get_error_message());
|
||||
}
|
||||
|
||||
@@ -32,7 +32,7 @@ final class MenuCreateAbilityTest extends TestCase
|
||||
|
||||
$result = (new MenuCreateAbility(FakeChangeLog::forbidden()))->execute(['name' => 'Hauptmenü']);
|
||||
|
||||
self::assertSame('lit_validation_failed', $result->get_error_code());
|
||||
self::assertToolError($result, 'validation_failed');
|
||||
}
|
||||
|
||||
public function testCreatesAndAssignsTheLocation(): void
|
||||
@@ -65,6 +65,6 @@ final class MenuCreateAbilityTest extends TestCase
|
||||
|
||||
$ability = new MenuCreateAbility(FakeChangeLog::forbidden());
|
||||
|
||||
self::assertSame('lit_forbidden', $ability->permission(['name' => 'Neu'])->get_error_code());
|
||||
self::assertToolError($ability->permission(['name' => 'Neu']), 'forbidden');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,9 +48,9 @@ final class MenuOperationsTest extends TestCase
|
||||
$cycle = $operations->apply($this->tree(), [['op' => 'move', 'id' => 1, 'parent_id' => 2]]);
|
||||
$badOp = $operations->apply($this->tree(), [['op' => 'rename', 'id' => 1]]);
|
||||
|
||||
self::assertArrayHasKey('operations.0', $unknown->get_error_data()['fields']);
|
||||
self::assertStringContainsString('unter sich selbst', $cycle->get_error_data()['fields']['operations.0']);
|
||||
self::assertStringContainsString('add, move oder remove', $badOp->get_error_data()['fields']['operations.0']);
|
||||
self::assertArrayHasKey('operations.0', self::errorFields($unknown));
|
||||
self::assertStringContainsString('unter sich selbst', self::errorFields($cycle)['operations.0']);
|
||||
self::assertStringContainsString('add, move oder remove', self::errorFields($badOp)['operations.0']);
|
||||
}
|
||||
|
||||
public function testExistingNodesKeepOnlyTheirIdSoTheWriterKeepsTheirData(): void
|
||||
|
||||
@@ -51,14 +51,14 @@ final class MenuReadAbilitiesTest extends TestCase
|
||||
self::assertSame('Start', $result['items'][0]['title']);
|
||||
self::assertSame(Rev::ofMenu([self::item(10, 0, 'Start')]), $result['menu_rev']);
|
||||
self::assertContains('menu_rev', $ability->outputSchema()['required']);
|
||||
self::assertSame('lit_not_found', $ability->execute(['menu_id' => 9])->get_error_code());
|
||||
self::assertToolError($ability->execute(['menu_id' => 9]), 'not_found');
|
||||
}
|
||||
|
||||
public function testReadToolsNeedThemeOptionRights(): void
|
||||
{
|
||||
Functions\when('current_user_can')->justReturn(false);
|
||||
|
||||
self::assertSame('lit_forbidden', (new MenuListAbility())->permission([])->get_error_code());
|
||||
self::assertSame('lit_forbidden', (new MenuGetAbility())->permission(['menu_id' => 3])->get_error_code());
|
||||
self::assertToolError((new MenuListAbility())->permission([]), 'forbidden');
|
||||
self::assertToolError((new MenuGetAbility())->permission(['menu_id' => 3]), 'forbidden');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -42,10 +42,10 @@ final class MenuSetItemsAbilityTest extends TestCase
|
||||
$stale = $ability->execute(['menu_id' => 3, 'menu_rev' => 'abcdefabcdef', 'items' => [['id' => 10]]]);
|
||||
$missing = $ability->execute(['menu_id' => 3, 'items' => [['id' => 10]]]);
|
||||
|
||||
self::assertSame('lit_rev_mismatch', $stale->get_error_code());
|
||||
self::assertToolError($stale, 'rev_mismatch');
|
||||
self::assertStringContainsString('lit/menu-get', $stale->get_error_data()['hint']);
|
||||
self::assertStringContainsString('Menü', $stale->get_error_message());
|
||||
self::assertSame('lit_rev_mismatch', $missing->get_error_code());
|
||||
self::assertToolError($missing, 'rev_mismatch');
|
||||
self::assertContains('menu_rev', $ability->inputSchema()['required']);
|
||||
self::assertStringContainsString('menu_rev', $ability->description());
|
||||
}
|
||||
@@ -68,7 +68,7 @@ final class MenuSetItemsAbilityTest extends TestCase
|
||||
{
|
||||
$ability = new MenuSetItemsAbility(new MenuWriter(), new MenuOperations(), FakeChangeLog::forbidden());
|
||||
|
||||
self::assertSame('lit_validation_failed', $ability->execute(['menu_id' => 3, 'menu_rev' => self::rev()])->get_error_code());
|
||||
self::assertToolError($ability->execute(['menu_id' => 3, 'menu_rev' => self::rev()]), 'validation_failed');
|
||||
self::assertSame(
|
||||
'lit_validation_failed',
|
||||
$ability->execute(['menu_id' => 3, 'menu_rev' => self::rev(), 'items' => [], 'operations' => [['op' => 'remove', 'id' => 10]]])
|
||||
@@ -81,7 +81,7 @@ final class MenuSetItemsAbilityTest extends TestCase
|
||||
Functions\when('wp_get_nav_menu_object')->justReturn(false);
|
||||
$ability = new MenuSetItemsAbility(new MenuWriter(), new MenuOperations(), FakeChangeLog::forbidden());
|
||||
|
||||
self::assertSame('lit_not_found', $ability->execute(['menu_id' => 9, 'items' => []])->get_error_code());
|
||||
self::assertToolError($ability->execute(['menu_id' => 9, 'items' => []]), 'not_found');
|
||||
}
|
||||
|
||||
public function testRemovalsNeedConfirmationAndNothingIsWritten(): void
|
||||
@@ -92,7 +92,7 @@ final class MenuSetItemsAbilityTest extends TestCase
|
||||
|
||||
$result = $ability->execute(['menu_id' => 3, 'menu_rev' => self::rev(), 'items' => []]);
|
||||
|
||||
self::assertSame('lit_confirm_required', $result->get_error_code());
|
||||
self::assertToolError($result, 'confirm_required');
|
||||
self::assertSame([['id' => 10, 'title' => 'Home']], $result->get_error_data()['removals']);
|
||||
}
|
||||
|
||||
@@ -109,8 +109,8 @@ final class MenuSetItemsAbilityTest extends TestCase
|
||||
'items' => [['id' => 10], ['type' => 'custom', 'url' => 'javascript:alert(1)', 'title' => 'X']],
|
||||
]);
|
||||
|
||||
self::assertSame('lit_validation_failed', $result->get_error_code());
|
||||
self::assertArrayHasKey('items.1', $result->get_error_data()['fields']);
|
||||
self::assertToolError($result, 'validation_failed');
|
||||
self::assertArrayHasKey('items.1', self::errorFields($result));
|
||||
}
|
||||
|
||||
public function testInvalidOperationsWriteNothing(): void
|
||||
@@ -121,7 +121,7 @@ final class MenuSetItemsAbilityTest extends TestCase
|
||||
|
||||
$result = $ability->execute(['menu_id' => 3, 'menu_rev' => self::rev(), 'operations' => [['op' => 'move', 'id' => 99]]]);
|
||||
|
||||
self::assertSame('lit_validation_failed', $result->get_error_code());
|
||||
self::assertToolError($result, 'validation_failed');
|
||||
}
|
||||
|
||||
public function testAppliesAndReturnsTheTreeBeforeAndAfter(): void
|
||||
@@ -190,7 +190,7 @@ final class MenuSetItemsAbilityTest extends TestCase
|
||||
['menu_id' => 3, 'menu_rev' => self::rev(), 'items' => [['type' => 'post', 'object_id' => 7]], 'allow_unpublished' => true]
|
||||
);
|
||||
|
||||
self::assertSame('lit_validation_failed', $result->get_error_code());
|
||||
self::assertToolError($result, 'validation_failed');
|
||||
self::assertArrayHasKey('allow_unpublished', $ability->inputSchema()['properties']);
|
||||
}
|
||||
|
||||
@@ -209,8 +209,8 @@ final class MenuSetItemsAbilityTest extends TestCase
|
||||
$refused = $ability->execute($input);
|
||||
$allowed = $ability->execute($input + ['allow_unpublished' => true]);
|
||||
|
||||
self::assertSame('lit_validation_failed', $refused->get_error_code());
|
||||
self::assertStringContainsString('allow_unpublished', $refused->get_error_data()['fields']['items.1']);
|
||||
self::assertToolError($refused, 'validation_failed');
|
||||
self::assertStringContainsString('allow_unpublished', self::errorFields($refused)['items.1']);
|
||||
self::assertStringContainsString('1 neu', $allowed['summary']);
|
||||
self::assertStringContainsString('sofort im Menü sichtbar', $allowed['warnings'][0]);
|
||||
}
|
||||
@@ -230,8 +230,8 @@ final class MenuSetItemsAbilityTest extends TestCase
|
||||
'operations' => [['op' => 'add', 'item' => ['type' => 'post', 'object_id' => 7]]],
|
||||
]);
|
||||
|
||||
self::assertSame('lit_validation_failed', $result->get_error_code());
|
||||
self::assertStringContainsString('Private Inhalte', $result->get_error_data()['fields']['items.1']);
|
||||
self::assertToolError($result, 'validation_failed');
|
||||
self::assertStringContainsString('Private Inhalte', self::errorFields($result)['items.1']);
|
||||
}
|
||||
|
||||
public function testAWriteFailureIsPassedOnAsWriteFailed(): void
|
||||
@@ -290,7 +290,7 @@ final class MenuSetItemsAbilityTest extends TestCase
|
||||
Functions\when('current_user_can')->justReturn(false);
|
||||
$ability = new MenuSetItemsAbility(new MenuWriter(), new MenuOperations(), FakeChangeLog::forbidden());
|
||||
|
||||
self::assertSame('lit_forbidden', $ability->permission(['menu_id' => 3, 'menu_rev' => self::rev()])->get_error_code());
|
||||
self::assertToolError($ability->permission(['menu_id' => 3, 'menu_rev' => self::rev()]), 'forbidden');
|
||||
}
|
||||
|
||||
public function testIsDestructiveAndDescribesWhenConfirmIsNeeded(): void
|
||||
|
||||
@@ -334,7 +334,7 @@ final class MenuWriterTest extends TestCase
|
||||
} catch (WriteFailed $e) {
|
||||
self::assertTrue($e->rolledBack);
|
||||
self::assertStringContainsString('kaputt', $e->getMessage());
|
||||
self::assertSame('lit_write_failed', $e->toError()->get_error_code());
|
||||
self::assertToolError($e->toError(), 'write_failed');
|
||||
}
|
||||
|
||||
$restore = $calls[3];
|
||||
@@ -357,7 +357,7 @@ final class MenuWriterTest extends TestCase
|
||||
} catch (WriteFailed $e) {
|
||||
self::assertFalse($e->rolledBack);
|
||||
$error = $e->toError();
|
||||
self::assertSame('lit_partial_write', $error->get_error_code());
|
||||
self::assertToolError($error, 'partial_write');
|
||||
self::assertSame(3, $error->get_error_data()['menu_id']);
|
||||
self::assertSame('Home', $error->get_error_data()['previous_items'][0]['title']);
|
||||
self::assertStringContainsString('lit/menu-get', $error->get_error_data()['hint']);
|
||||
|
||||
Reference in New Issue
Block a user