Add validation for progress

dereuromark · Aug 18, 2022 · 08eefaa · 08eefaa
1 parent a867ead
commit 08eefaa
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 2 deletions.
diff --git a/src/Model/Table/QueuedJobsTable.php b/src/Model/Table/QueuedJobsTable.php
@@ -172,6 +172,11 @@ public function validationDefault(Validator $validator): Validator {
 			->requirePresence('job_task', 'create')
 			->notEmptyString('job_task');
 
+		$validator
+			->greaterThanOrEqual('progress', 0)
+			->lessThanOrEqual('progress', 1)
+			->allowEmpty('progress');
+
 		return $validator;
 	}
 

diff --git a/tests/TestCase/Model/Table/QueueProcessesTableTest.php b/tests/TestCase/Model/Table/QueueProcessesTableTest.php
@@ -21,10 +21,11 @@ class QueueProcessesTableTest extends TestCase {
 	protected $QueueProcesses;
 
 	/**
-	 * @var array
+	 * @var array<string>
 	 */
 	protected $fixtures = [
 		'plugin.Queue.QueueProcesses',
+		'plugin.Queue.QueuedJobs',
 	];
 
 	/**

diff --git a/tests/TestCase/Model/Table/QueuedJobsTableTest.php b/tests/TestCase/Model/Table/QueuedJobsTableTest.php
@@ -26,7 +26,7 @@ class QueuedJobsTableTest extends TestCase {
 	protected $QueuedJobs;
 
 	/**
-	 * @var array
+	 * @var array<string>
 	 */
 	protected $fixtures = [
 		'plugin.Queue.QueuedJobs',
@@ -104,6 +104,39 @@ public function testCreateAndCount() {
 		$this->assertSame(1, $this->QueuedJobs->getLength('Queue.ExceptionExample'));
 	}
 
+	/**
+	 * @return void
+	 */
+	public function testMarkJobDone() {
+		$job = $this->QueuedJobs->createJob('Foo', [
+			'some' => 'random',
+			'test' => 'data',
+		]);
+		$this->assertTrue($this->QueuedJobs->markJobDone($job));
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testMarkJobFailed() {
+		$job = $this->QueuedJobs->createJob('Foo', [
+			'some' => 'random',
+			'test' => 'data',
+		]);
+		$this->assertTrue($this->QueuedJobs->markJobFailed($job));
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testFlushFailedJobs() {
+		$this->QueuedJobs->createJob('Foo', [
+			'some' => 'random',
+			'test' => 'data',
+		]);
+		$this->assertSame(0, $this->QueuedJobs->flushFailedJobs());
+	}
+
 	/**
 	 * Test the basic create and fetch functions.
 	 *