Demo follow-ups: editable policy name, one-page signup, group classes in upcoming lessons, deletion cleanup
CI / Tests (PHP 8.1) (pull_request) Successful in 1m0s
CI / Tests (PHP 8.2) (pull_request) Successful in 1m0s
CI / No Debug Code (pull_request) Successful in 3s
CI / Coding Standards (pull_request) Successful in 3m8s
CI / Build Plugin Zip (pull_request) Skipped
CI / PHPStan (pull_request) Successful in 2m49s
CI / Tests (PHP 8.3) (pull_request) Successful in 2m44s

Five items from the latest demo pass:

- A policy's title can be edited from the Policies screen. Only the title
  moves; the slug is what the gates resolve policies by, so a rename can
  never detach a policy from acceptances already recorded against it.
- Signup is one page again. The studio's registration questions move from
  a second step behind "Next" onto the main form, in an "About you" panel
  above the students being added, and that panel also asks an adult
  student for their birth year (the same us_birth_year meta a child's
  uses). register.js disables and hides the whole panel for a pure
  guardian, since the questions describe a student.
- The password is re-scored on submit, not only as it is typed. zxcvbn's
  dictionary arrives after page load, so a password typed straight away
  was never scored at all and the first the student heard of it was the
  server rejecting the whole form.
- Group-class sessions appear alongside lessons wherever upcoming lessons
  are listed: the [us_scheduler] panel (students and instructors) and the
  admin student detail page. GroupClass\SessionSchedule derives them from
  Offering::sessionWindows(), the same derivation the billing scan uses.
  They carry kind = 'group_class' and no Cancel action - a session is one
  date in a term, not a booked slot.
- Deleting a user releases what the account was holding: each upcoming
  lesson is cancelled, its slot freed for rebooking, its pending payment
  voided, and active class enrolments cancelled. Past lessons and paid
  history are left alone.

Tests: composer test (851), composer lint, composer cs all pass.

Co-Authored-By: Claude Opus 5 <[email protected]>
This commit is contained in:
2026-07-30 11:45:04 -03:00
co-authored by Claude Opus 5
parent 258468093b
commit cb347ffca0
33 changed files with 1419 additions and 291 deletions
+138 -8
View File
@@ -78,6 +78,7 @@ class RegistrationPageTest extends TestCase
$this->ctx['guardians'] = Mockery::mock(GuardianService::class);
// Recorded on every successful signup; the tests that care assert on it.
$this->ctx['guardians']->shouldReceive('setGuardianOnly')->byDefault();
$this->ctx['guardians']->shouldReceive('setBirthYear')->byDefault();
$this->ctx['page'] = new RegistrationPage(
$invites,
@@ -133,7 +134,7 @@ class RegistrationPageTest extends TestCase
public function testInviteBranchCreatesAndLogsInTheStudent(): void
{
$_POST = [ 'password' => 'thistle-marrow-42', 'display_name' => 'Ada' ];
$_POST = [ 'password' => 'thistle-marrow-42', 'display_name' => 'Ada', 'birth_year' => '1990' ];
Functions\when('email_exists')->justReturn(false);
Functions\when('wp_insert_user')->justReturn(42);
@@ -150,7 +151,7 @@ class RegistrationPageTest extends TestCase
public function testInviteAcceptanceLinksClassGrantForTheEmail(): void
{
$_POST = [ 'password' => 'thistle-marrow-42', 'display_name' => 'Ada' ];
$_POST = [ 'password' => 'thistle-marrow-42', 'display_name' => 'Ada', 'birth_year' => '1990' ];
Functions\when('email_exists')->justReturn(false);
Functions\when('wp_insert_user')->justReturn(42);
@@ -170,7 +171,7 @@ class RegistrationPageTest extends TestCase
public function testOpenBranchCreatesPendingWithoutLoginAndEmails(): void
{
$_POST = [ 'password' => 'thistle-marrow-42', 'display_name' => 'Ada', 'email' => '[email protected]' ];
$_POST = [ 'password' => 'thistle-marrow-42', 'display_name' => 'Ada', 'email' => '[email protected]', 'birth_year' => '1990' ];
Functions\when('is_email')->justReturn(true);
Functions\when('email_exists')->justReturn(false);
@@ -197,7 +198,7 @@ class RegistrationPageTest extends TestCase
public function testGroupInviteCreatesPendingAutoApproveAccountEvenWhenClosed(): void
{
$_POST = [ 'password' => 'thistle-marrow-42', 'display_name' => 'Ada', 'email' => '[email protected]' ];
$_POST = [ 'password' => 'thistle-marrow-42', 'display_name' => 'Ada', 'email' => '[email protected]', 'birth_year' => '1990' ];
Functions\when('is_email')->justReturn(true);
Functions\when('email_exists')->justReturn(false);
@@ -365,7 +366,7 @@ class RegistrationPageTest extends TestCase
public function testRejectsWhenARequiredPolicyIsUnaccepted(): void
{
$_POST = [ 'password' => 'thistle-marrow-42', 'display_name' => 'Ada', 'email' => '[email protected]' ];
$_POST = [ 'password' => 'thistle-marrow-42', 'display_name' => 'Ada', 'email' => '[email protected]', 'birth_year' => '1990' ];
Functions\when('is_email')->justReturn(true);
@@ -384,7 +385,7 @@ class RegistrationPageTest extends TestCase
public function testRejectsWhenARequiredAccountQuestionIsUnanswered(): void
{
$_POST = [ 'password' => 'thistle-marrow-42', 'display_name' => 'Ada', 'email' => '[email protected]' ];
$_POST = [ 'password' => 'thistle-marrow-42', 'display_name' => 'Ada', 'email' => '[email protected]', 'birth_year' => '1990' ];
Functions\when('is_email')->justReturn(true);
@@ -406,6 +407,7 @@ class RegistrationPageTest extends TestCase
$_POST = [
'password' => 'thistle-marrow-42',
'display_name' => 'Ada',
'birth_year' => '1990',
'us_answers' => [ '5' => 'By a friend' ],
];
@@ -438,7 +440,7 @@ class RegistrationPageTest extends TestCase
public function testMaybeHandleSubmitLogsInInviteAndRedirects(): void
{
$_POST = [ 'us_register' => '1', 'password' => 'thistle-marrow-42', 'display_name' => 'Ada' ];
$_POST = [ 'us_register' => '1', 'password' => 'thistle-marrow-42', 'display_name' => 'Ada', 'birth_year' => '1990' ];
$_REQUEST = [ 'us_invite' => 'raw-token' ];
Functions\when('is_user_logged_in')->justReturn(false);
@@ -756,6 +758,7 @@ class RegistrationPageTest extends TestCase
$_POST = [
'password' => 'thistle-marrow-42',
'display_name' => 'Grace',
'birth_year' => '1990',
'us_registering_for' => $mode,
];
@@ -811,6 +814,7 @@ class RegistrationPageTest extends TestCase
$_POST = [
'password' => 'thistle-marrow-42',
'display_name' => 'Grace',
'birth_year' => '1990',
'us_registering_for' => 'something-else',
'children' => [['name' => 'Ada', 'birth_year' => '2015', 'answers' => []]],
];
@@ -836,6 +840,7 @@ class RegistrationPageTest extends TestCase
$_POST = [
'password' => 'thistle-marrow-42',
'display_name' => 'Grace',
'birth_year' => '1990',
'us_registering_for' => RegistrationPage::FOR_BOTH,
'us_answers' => ['7' => 'Cello'],
'children' => [['name' => 'Ada', 'birth_year' => '2015', 'answers' => [7 => 'Piano']]],
@@ -866,6 +871,7 @@ class RegistrationPageTest extends TestCase
$_POST = [
'password' => 'thistle-marrow-42',
'display_name' => 'Grace',
'birth_year' => '1990',
'us_registering_for' => RegistrationPage::FOR_BOTH,
'us_answers' => ['7' => ' '],
'children' => [['name' => 'Ada', 'birth_year' => '2015', 'answers' => [7 => 'Piano']]],
@@ -1104,7 +1110,7 @@ class RegistrationPageTest extends TestCase
public function testANonGuardianSignupIsUnchangedAndCreatesNoChildren(): void
{
$_POST = ['password' => 'thistle-marrow-42', 'display_name' => 'Ada'];
$_POST = ['password' => 'thistle-marrow-42', 'display_name' => 'Ada', 'birth_year' => '1990'];
Functions\when('email_exists')->justReturn(false);
Functions\when('wp_insert_user')->justReturn(42);
@@ -1117,4 +1123,128 @@ class RegistrationPageTest extends TestCase
self::assertSame('invite', $this->submit(new Invite(email: '[email protected]', token: 'hash'), false));
}
/**
* The account holder is a student under "self" and "both", so they give the
* same birth year every other student does — and it is stored against their
* own account under the same meta key a child's uses.
*
* @dataProvider modesWhereTheAccountHolderIsAStudent
*/
public function testTheAccountHoldersBirthYearIsRecordedWhenTheyAreAStudent(string $mode, bool $withChildren): void
{
$_POST = [
'password' => 'thistle-marrow-42',
'display_name' => 'Grace',
'birth_year' => '1988',
'us_registering_for' => $mode,
];
if ($withChildren) {
$_POST['children'] = [['name' => 'Ada', 'birth_year' => '2015', 'answers' => []]];
$this->ctx['guardians']->shouldReceive('createChild')->once()->andReturn(101);
}
$this->stubInviteSuccess();
$this->ctx['guardians']->shouldReceive('setBirthYear')->once()->with(42, '1988');
self::assertSame('invite', $this->submit(new Invite(email: '[email protected]', token: 'hash'), false));
}
/** @return array<string, array{string, bool}> */
public static function modesWhereTheAccountHolderIsAStudent(): array
{
return [
'just myself' => [RegistrationPage::FOR_SELF, false],
'myself and students' => [RegistrationPage::FOR_BOTH, true],
];
}
/**
* Missing or nonsense years are refused before a single user is created, the
* same way a student's is — the browser's `required` cannot be trusted here
* because the panel is hidden for a pure guardian.
*
* @dataProvider unusableBirthYears
*/
public function testAnUnusableBirthYearForTheAccountHolderIsRejected(string $submitted): void
{
$_POST = [
'password' => 'thistle-marrow-42',
'display_name' => 'Grace',
'birth_year' => $submitted,
];
Functions\when('email_exists')->justReturn(false);
Functions\expect('wp_insert_user')->never();
$result = $this->submit(new Invite(email: '[email protected]', token: 'hash'), false);
// Addressed to the person filling the form in, not to "each student".
self::assertStringContainsString('Please give your birth year', $result);
self::assertStringNotContainsString('each student', $result);
}
/** @return array<string, array{string}> */
public static function unusableBirthYears(): array
{
return [
'missing' => [''],
'two digits' => ['88'],
'not a year' => ['nineteen'],
'in future' => ['3000'],
];
}
/**
* A pure guardian is not a student, so no birth year is asked of them and
* none is stored — anything posted for one is ignored, exactly as their
* answers are.
*/
public function testNoBirthYearIsStoredForAGuardianWhoIsNotAStudent(): void
{
$_POST = [
'password' => 'thistle-marrow-42',
'display_name' => 'Grace',
'birth_year' => 'should be ignored',
'us_registering_for' => RegistrationPage::FOR_STUDENTS,
'children' => [['name' => 'Ada', 'birth_year' => '2015', 'answers' => []]],
];
$this->ctx['guardians']->shouldReceive('createChild')->once()->andReturn(101);
$this->stubInviteSuccess();
$this->ctx['guardians']->shouldNotReceive('setBirthYear');
self::assertSame('invite', $this->submit(new Invite(email: '[email protected]', token: 'hash'), false));
}
/**
* Everything the studio needs is asked on one page: the account holder's own
* birth year and questions sit above the students they are adding, and there
* is no second step to advance to.
*/
public function testTheFormAsksTheAccountHoldersQuestionsAboveTheStudents(): void
{
$this->stubRenderContext();
$question = new Question(null, 'Instrument', isRequired: true, scope: Question::SCOPE_ACCOUNT, id: 7);
$this->ctx['questions']->shouldReceive('findByScope')->with(Question::SCOPE_ACCOUNT, Mockery::any())->andReturn([$question]);
$html = $this->ctx['page']->render([]);
self::assertStringContainsString('name="birth_year"', $html);
self::assertStringContainsString('name="us_answers[7]"', $html);
// One page, one submit: no "Next", no step panels.
self::assertStringNotContainsString('us-reg-next', $html);
self::assertStringNotContainsString('data-step', $html);
self::assertLessThan(
strpos($html, 'id="us-children"'),
strpos($html, 'name="us_answers[7]"'),
'The account holder answers the questions above the students they are adding.'
);
}
}