diff --git a/plugin.conf b/plugin.conf index 9186864..5deb477 100644 --- a/plugin.conf +++ b/plugin.conf @@ -2,7 +2,7 @@ name=global-autoresponder id=global-autoresponder type=user author=HITME.PL -version=1.4.11 +version=1.4.12 active=no installed=no user_run_as=root diff --git a/tests/rule_validator_test.php b/tests/rule_validator_test.php index 0d2e70a..aa77073 100644 --- a/tests/rule_validator_test.php +++ b/tests/rule_validator_test.php @@ -4,17 +4,30 @@ declare(strict_types=1); require_once PLUGIN_ROOT . '/exec/lib/Settings.php'; require_once PLUGIN_ROOT . '/exec/lib/RuleValidator.php'; +/** @return array{0:string,1:string} */ +function future_exact_schedule(Settings $settings, string $startTime = '09:37', string $endTime = '17:12'): array +{ + $tz = new DateTimeZone($settings->timezone()); + [$startHour, $startMinute] = array_map('intval', explode(':', $startTime)); + [$endHour, $endMinute] = array_map('intval', explode(':', $endTime)); + $start = (new DateTimeImmutable('tomorrow', $tz))->setTime($startHour, $startMinute); + $end = (new DateTimeImmutable('+15 days', $tz))->setTime($endHour, $endMinute); + + return [$start->format('Y-m-d\TH:i'), $end->format('Y-m-d\TH:i')]; +} + test('rule validator normalizes exact hour schedule', function (): void { $settingsPath = TEST_TMP . '/validator.conf'; test_write($settingsPath, "GLOBAL_AUTORESPONDER_TIMEZONE=Europe/Warsaw\n"); $settings = Settings::load($settingsPath); + [$startValue, $endValue] = future_exact_schedule($settings); $rule = RuleValidator::validate([ 'name' => 'Urlop czerwcowy', 'subject_prefix' => 'Urlop', 'reply_frequency' => '120', 'body' => "Dzień dobry\r\nWracam jutro", - 'start_value' => '2026-06-10T09:37', - 'end_value' => '2026-06-24T17:12', + 'start_value' => $startValue, + 'end_value' => $endValue, 'enabled' => '1', ], $settings); @@ -23,35 +36,37 @@ test('rule validator normalizes exact hour schedule', function (): void { assert_same(120, $rule['repeat_minutes']); assert_same("Dzień dobry\nWracam jutro", $rule['body']); assert_same('exact_hour', $rule['schedule_mode']); - assert_same('2026-06-10T09:37', $rule['start_value']); + assert_same($startValue, $rule['start_value']); assert_true($rule['start_ts'] < $rule['end_ts']); }); test('rule validator accepts exact hour schedule', function (): void { $settings = Settings::load(TEST_TMP . '/validator-da.conf'); + [$startValue, $endValue] = future_exact_schedule($settings, '00:00', '23:59'); $rule = RuleValidator::validate([ 'subject_prefix' => 'Urlop', 'reply_frequency' => '1', 'body' => 'Body', - 'start_value' => '2026-06-10T00:00', - 'end_value' => '2026-06-24T23:59', + 'start_value' => $startValue, + 'end_value' => $endValue, 'enabled' => '1', ], $settings); assert_same('exact_hour', $rule['schedule_mode']); assert_same(1, $rule['repeat_minutes']); - assert_same('2026-06-10T00:00', $rule['start_value']); - assert_same('2026-06-24T23:59', $rule['end_value']); + assert_same($startValue, $rule['start_value']); + assert_same($endValue, $rule['end_value']); }); test('rule validator rejects unsupported non-interval frequency', function (): void { $settings = Settings::load(TEST_TMP . '/validator-da-every.conf'); + [$startValue, $endValue] = future_exact_schedule($settings, '00:00', '23:59'); try { RuleValidator::validate([ 'subject_prefix' => 'Urlop', 'reply_frequency' => 'every', 'body' => 'Body', - 'start_value' => '2026-06-10T00:00', - 'end_value' => '2026-06-24T23:59', + 'start_value' => $startValue, + 'end_value' => $endValue, ], $settings); } catch (InvalidArgumentException $e) { assert_contains('Częstość odpowiedzi', $e->getMessage()); @@ -78,13 +93,14 @@ test('rule validator rejects header injection and reversed dates', function (): test('rule validator rejects unsupported response frequency', function (): void { $settings = Settings::load(TEST_TMP . '/missing-frequency.conf'); + [$startValue, $endValue] = future_exact_schedule($settings, '00:00', '23:59'); try { RuleValidator::validate([ 'subject_prefix' => 'Urlop', 'reply_frequency' => '45', 'body' => 'Body', - 'start_value' => '2026-06-10T00:00', - 'end_value' => '2026-06-24T23:59', + 'start_value' => $startValue, + 'end_value' => $endValue, ], $settings); } catch (InvalidArgumentException $e) { assert_contains('Częstość odpowiedzi', $e->getMessage());