|
diff --git a/tests/Unit/GroupClass/EnrollmentEndpointTest.php b/tests/Unit/GroupClass/EnrollmentEndpointTest.php
index 489a785..d133aa7 100644
--- a/tests/Unit/GroupClass/EnrollmentEndpointTest.php
+++ b/tests/Unit/GroupClass/EnrollmentEndpointTest.php
@@ -32,6 +32,7 @@ class EnrollmentEndpointTest extends TestCase
Functions\when('wp_unslash')->returnArg();
Functions\when('sanitize_text_field')->returnArg();
Functions\when('get_current_user_id')->justReturn(5);
+ Functions\when('current_time')->justReturn('2026-07-24');
$this->enrollments = Mockery::mock(EnrollmentRepository::class);
$this->offerings = Mockery::mock(OfferingRepository::class);
@@ -108,6 +109,36 @@ class EnrollmentEndpointTest extends TestCase
);
}
+ public function testRejectsEnrollmentAfterExplicitDeadline(): void
+ {
+ // current_time is stubbed to 2026-07-24, past the 2026-07-10 deadline.
+ $offering = new Offering(instructorId: 3, kind: Offering::KIND_GROUP_CLASS, title: 'Choir', termStart: '2026-07-01', enrollmentDeadline: '2026-07-10', id: 8);
+ $this->offerings->shouldReceive('findById')->with(8)->andReturn($offering);
+ $this->enrollments->shouldReceive('hasActiveEnrollment')->with(8, 5)->andReturn(false);
+ $this->enrollments->shouldReceive('insert')->never();
+
+ $result = $this->endpoint->enroll(new \WP_REST_Request(['offering_id' => 8]));
+
+ self::assertInstanceOf(\WP_Error::class, $result);
+ self::assertSame('enrollment_closed', $result->get_error_code());
+ self::assertSame(403, $result->error_data['enrollment_closed']['status']);
+ }
+
+ public function testRejectsEnrollmentAfterDefaultDeadlineOfFirstClassDay(): void
+ {
+ // No explicit deadline, so it defaults to term_start (the first class day),
+ // which is in the past relative to the stubbed 2026-07-24 "today".
+ $offering = new Offering(instructorId: 3, kind: Offering::KIND_GROUP_CLASS, title: 'Choir', termStart: '2026-07-20', id: 8);
+ $this->offerings->shouldReceive('findById')->with(8)->andReturn($offering);
+ $this->enrollments->shouldReceive('hasActiveEnrollment')->with(8, 5)->andReturn(false);
+ $this->enrollments->shouldReceive('insert')->never();
+
+ $result = $this->endpoint->enroll(new \WP_REST_Request(['offering_id' => 8]));
+
+ self::assertInstanceOf(\WP_Error::class, $result);
+ self::assertSame('enrollment_closed', $result->get_error_code());
+ }
+
public function testInviteOnlyClassRejectsStudentWithoutGrant(): void
{
$this->offerings->shouldReceive('findById')->with(8)->andReturn($this->inviteOnlyOffering());
diff --git a/tests/Unit/GroupClass/GroupClassControllerTest.php b/tests/Unit/GroupClass/GroupClassControllerTest.php
index aa17e14..b38c6d7 100644
--- a/tests/Unit/GroupClass/GroupClassControllerTest.php
+++ b/tests/Unit/GroupClass/GroupClassControllerTest.php
@@ -65,6 +65,7 @@ class GroupClassControllerTest extends TestCase
static fn (string $format, string $date) => date($format, (int) strtotime($date))
);
Functions\when('wp_nonce_field')->justReturn('');
+ Functions\when('current_time')->justReturn('2026-01-01');
$_GET = [];
}
@@ -183,6 +184,49 @@ class GroupClassControllerTest extends TestCase
self::assertStringContainsString('Invite by email', $html);
}
+ public function testClassDetailOffersDirectAddForPublicClassWithoutInviteControls(): void
+ {
+ Functions\when('get_userdata')->justReturn($this->userNamed('Ada Lovelace'));
+ $_GET = ['class_id' => '8'];
+
+ // A plain public group class — the instructor can still add students
+ // directly (a late enrolment), but the invite-only controls are absent.
+ $offering = $this->offering(8, 'Choir', 10);
+
+ $this->offerings->shouldReceive('findAll')->once()->andReturn([$offering]);
+ $this->enrollments->shouldReceive('findByInstructor')->once()->with(3)->andReturn([]);
+
+ $html = $this->renderInstructor();
+
+ self::assertStringContainsString('Add students directly', $html);
+ self::assertStringContainsString('add_direct', $html);
+ self::assertStringNotContainsString('Invite by email', $html);
+ self::assertStringNotContainsString('Make available to students', $html);
+ }
+
+ public function testClassDetailFlagsLateEnrolmentPastTheDeadline(): void
+ {
+ Functions\when('get_userdata')->justReturn($this->userNamed('Ada Lovelace'));
+ // current_time is stubbed to 2026-01-01, which is past this class's deadline.
+ $_GET = ['class_id' => '8'];
+
+ $offering = new Offering(
+ instructorId: 3,
+ kind: Offering::KIND_GROUP_CLASS,
+ title: 'Choir',
+ termStart: '2025-09-08',
+ id: 8,
+ );
+
+ $this->offerings->shouldReceive('findAll')->once()->andReturn([$offering]);
+ $this->enrollments->shouldReceive('findByInstructor')->once()->with(3)->andReturn([]);
+
+ $html = $this->renderInstructor();
+
+ self::assertStringContainsString('late enrolments', $html);
+ self::assertStringContainsString('Add students directly', $html);
+ }
+
public function testClassDetailEnrolmentCountExcludesCancelledButRosterKeepsThem(): void
{
Functions\when('get_userdata')->justReturn($this->userNamed('Grace Hopper'));
diff --git a/tests/Unit/Offering/OfferingControllerTest.php b/tests/Unit/Offering/OfferingControllerTest.php
index b78ddf7..ec72e42 100644
--- a/tests/Unit/Offering/OfferingControllerTest.php
+++ b/tests/Unit/Offering/OfferingControllerTest.php
@@ -102,6 +102,43 @@ class OfferingControllerTest extends TestCase
self::assertStringContainsString('2 open booking slots were removed', $html);
}
+ public function testAddGroupClassStoresEnrollmentDeadline(): void
+ {
+ $_POST = [
+ 'usc_action' => 'add',
+ 'title' => 'Ballet Beginners',
+ 'kind' => Offering::KIND_GROUP_CLASS,
+ 'term_start' => '2026-09-08',
+ 'enrollment_deadline' => '2026-08-31',
+ ];
+
+ $this->repository->shouldReceive('insert')->once()->with(Mockery::on(
+ static fn (Offering $o) => '2026-08-31' === $o->enrollmentDeadline
+ ))->andReturn(1);
+ $this->repository->shouldReceive('findAll')->andReturn([]);
+ $this->reconciler->shouldReceive('reconcile')->once()->andReturn(['removed' => 0, 'conflicts' => []]);
+
+ $this->render();
+ }
+
+ public function testBlankEnrollmentDeadlineLeavesItNullToDefaultToFirstClass(): void
+ {
+ $_POST = [
+ 'usc_action' => 'add',
+ 'title' => 'Choir',
+ 'kind' => Offering::KIND_GROUP_CLASS,
+ 'term_start' => '2026-09-08',
+ ];
+
+ $this->repository->shouldReceive('insert')->once()->with(Mockery::on(
+ static fn (Offering $o) => null === $o->enrollmentDeadline
+ ))->andReturn(1);
+ $this->repository->shouldReceive('findAll')->andReturn([]);
+ $this->reconciler->shouldReceive('reconcile')->once()->andReturn(['removed' => 0, 'conflicts' => []]);
+
+ $this->render();
+ }
+
public function testGarbageClassTimeIsRejected(): void
{
$_POST = [
diff --git a/tests/Unit/Offering/OfferingTest.php b/tests/Unit/Offering/OfferingTest.php
index 615ca92..a5286bd 100644
--- a/tests/Unit/Offering/OfferingTest.php
+++ b/tests/Unit/Offering/OfferingTest.php
@@ -277,4 +277,48 @@ class OfferingTest extends TestCase
self::assertContains(Offering::BILLING_ONE_TIME, Offering::VALID_BILLING_MODES);
self::assertContains(Offering::BILLING_FULL_TERM, Offering::VALID_BILLING_MODES);
}
+
+ public function testEffectiveEnrollmentDeadlineDefaultsToTermStart(): void
+ {
+ $offering = new Offering(1, Offering::KIND_GROUP_CLASS, 'Choir', termStart: '2026-09-08');
+
+ self::assertSame('2026-09-08', $offering->effectiveEnrollmentDeadline());
+ }
+
+ public function testEffectiveEnrollmentDeadlineUsesExplicitValueWhenSet(): void
+ {
+ $offering = new Offering(1, Offering::KIND_GROUP_CLASS, 'Choir', termStart: '2026-09-08', enrollmentDeadline: '2026-08-31');
+
+ self::assertSame('2026-08-31', $offering->effectiveEnrollmentDeadline());
+ }
+
+ public function testEffectiveEnrollmentDeadlineIsNullWithoutDates(): void
+ {
+ $offering = new Offering(1, Offering::KIND_GROUP_CLASS, 'Choir');
+
+ self::assertNull($offering->effectiveEnrollmentDeadline());
+ }
+
+ public function testIsEnrollmentOpenOnAndBeforeTheDeadlineDay(): void
+ {
+ $offering = new Offering(1, Offering::KIND_GROUP_CLASS, 'Choir', termStart: '2026-09-08', enrollmentDeadline: '2026-08-31');
+
+ self::assertTrue($offering->isEnrollmentOpen('2026-08-30'));
+ self::assertTrue($offering->isEnrollmentOpen('2026-08-31'));
+ self::assertFalse($offering->isEnrollmentOpen('2026-09-01'));
+ }
+
+ public function testIsEnrollmentOpenAlwaysTrueWithoutADeadline(): void
+ {
+ $offering = new Offering(1, Offering::KIND_GROUP_CLASS, 'Choir');
+
+ self::assertTrue($offering->isEnrollmentOpen('2099-01-01'));
+ }
+
+ public function testToArrayIncludesEnrollmentDeadline(): void
+ {
+ $offering = new Offering(1, Offering::KIND_GROUP_CLASS, 'Choir', enrollmentDeadline: '2026-08-31', id: 10);
+
+ self::assertSame('2026-08-31', $offering->toArray()['enrollment_deadline']);
+ }
}
diff --git a/unsupervised-schedular.php b/unsupervised-schedular.php
index 36ffc36..472bf1b 100644
--- a/unsupervised-schedular.php
+++ b/unsupervised-schedular.php
@@ -3,7 +3,7 @@
* Plugin Name: Unsupervised Scheduler
* Plugin URI: https://git.unsupervised.ca/Unsupervised/unsupervised-scheduler
* Description: Instructor/student lesson scheduling for WordPress.
- * Version: 1.1.2
+ * Version: 1.1.3
* Requires at least: 6.2
* Requires PHP: 8.1
* Author: Unsupervised
@@ -21,7 +21,7 @@ if (! defined('ABSPATH')) {
exit;
}
-define('USC_VERSION', '1.1.2');
+define('USC_VERSION', '1.1.3');
define('USC_PLUGIN_FILE', __FILE__);
define('USC_PLUGIN_DIR', plugin_dir_path(__FILE__));
define('USC_PLUGIN_URL', plugin_dir_url(__FILE__));
|