CrontabRepository->findByRegex now search inside all of the crontab line

TiBeN · Jul 6, 2015 · fbc9409 · fbc9409
1 parent 91155ba
commit fbc9409
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/src/CrontabManager/CrontabRepository.php b/src/CrontabManager/CrontabRepository.php
@@ -98,7 +98,7 @@ public function findJobByRegex($regex)
 
         if (!empty($this->crontabJobs)) {
             foreach ($this->crontabJobs as $crontabJob) {
-                if (preg_match($regex, $crontabJob->taskCommandLine)) {
+                if (preg_match($regex, $crontabJob->formatCrontabLine())) {
                     array_push($crontabJobs, $crontabJob);
                 }
             }

diff --git a/tests/CrontabManager/Tests/CrontabRepositoryTest.php b/tests/CrontabManager/Tests/CrontabRepositoryTest.php
@@ -150,6 +150,41 @@ public function testFindJobByRegex()
 
     }
 
+    /**
+     * Test finding a job by a regular expression
+     * using the comments
+     */
+    public function testFindJobByRegexUsingComments()
+    {
+        /* Create fake crontabAdapter */
+        $fakeCrontabAdapter = $this->getMock('TiBeN\CrontabManager\CrontabAdapter');
+        $fakeCrontabAdapter
+            ->expects($this->any())
+            ->method('readCrontab')
+            ->will(
+                $this->returnValue("")
+            )
+        ;
+
+        $crontabJob = new CrontabJob();
+        $crontabJob->minutes = '30';
+        $crontabJob->hours = '23';
+        $crontabJob->dayOfMonth = '*';
+        $crontabJob->months = '*';
+        $crontabJob->dayOfWeek = '*';
+        $crontabJob->taskCommandLine = 'df >> /tmp/df.log';
+        $crontabJob->comments = 'Logging disk usage';
+
+        $expectedCrontabJobs = array($crontabJob);
+
+        $crontabRepository = new CrontabRepository($fakeCrontabAdapter);
+        $crontabRepository->addJob($crontabJob);
+
+        $crontabJobs = $crontabRepository->findJobByRegex('/Logging\ disk\ usage/'); 
+
+        $this->assertEquals($expectedCrontabJobs, $crontabJobs);
+    }
+
     /**
      * This test will modify an existing job and append a new job to the crontab.
      */