add test and rearrange logic

crealoz · Jan 16, 2025 · 9301544 · 9301544
1 parent 75af2bf
commit 9301544
Show file tree

Hide file tree

Showing 24 changed files with 765 additions and 512 deletions.
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -10,8 +10,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: List files
-        run: ls -la
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v5
         env:

diff --git a/Exception/Processor/Modules/IgnoredModuleException.php b/Exception/Processor/Modules/IgnoredModuleException.php
diff --git a/Processor/Files/Logic/Modules/CheckEnabled.php b/Processor/Files/Logic/Modules/CheckEnabled.php
diff --git a/Processor/Type/Logic.php b/Processor/Type/Logic.php
@@ -18,7 +18,7 @@ protected function doProcess(array $processors, array $files, ProgressBar $progr
         foreach ($processors as $processor) {
             $progressBar?->advance();
             if (!$processor instanceof AuditProcessorInterface) {
-                throw new \InvalidArgumentException('Processor must implement ProcessorInterface');
+                throw new \InvalidArgumentException('Processor must implement AuditProcessorInterface');
             }
             if ($processor instanceof ArrayProcessorInterface) {
                 $processor->setArray($files);

diff --git a/Processor/Type/PHPCode.php b/Processor/Type/PHPCode.php
@@ -21,7 +21,7 @@ protected function doProcess(array $processors, array $files, ProgressBar $progr
             }
             foreach ($processors as $processor) {
                 if (!$processor instanceof AuditProcessorInterface) {
-                    throw new \InvalidArgumentException('Processor must implement ProcessorInterface');
+                    throw new \InvalidArgumentException('Processor must implement AuditProcessorInterface');
                 }
                 if ($processor instanceof FileProcessorInterface) {
                     $processor->setFile($codeFile);

diff --git a/Service/ModuleTools.php b/Service/ModuleTools.php
@@ -54,7 +54,6 @@ public function getModuleNameByAnyFile(string $filePath, bool $isVendor = false)
             $input = $this->modulePath->getDeclarationXml($filePath, $isVendor);
             return $this->getModuleNameByModuleXml($input);
         } catch (\InvalidArgumentException $e) {
-            dump($filePath);
             $input = $this->modulePath->getDeclarationXml($filePath, !$isVendor);
             return $this->getModuleNameByModuleXml($input);
         }

diff --git a/...Unit/Model/AuditRequestRepositoryTest.php → ...tion/Model/AuditRequestRepositoryTest.php b/...Unit/Model/AuditRequestRepositoryTest.php → ...tion/Model/AuditRequestRepositoryTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Crealoz\EasyAudit\Test\Unit\Model;
+namespace Crealoz\EasyAudit\Test\Integration\Model;
 
 use Crealoz\EasyAudit\Model\ResourceModel\AuditRequest;
 
@@ -71,10 +71,12 @@ public function testGetList()
         $searchCriteria = $this->createMock(\Magento\Framework\Api\SearchCriteriaInterface::class);
         $searchResult = $this->createMock(\Magento\Framework\Api\SearchResultsInterface::class);
         $collection = $this->createMock(\Crealoz\EasyAudit\Model\ResourceModel\AuditRequest\Collection::class);
+
         $this->collectionFactory->expects($this->once())->method('create')->willReturn($collection);
         $this->collectionProcessor->expects($this->once())->method('process')->with($searchCriteria, $collection);
         $collection->expects($this->once())->method('getSize')->willReturn(1);
         $collection->expects($this->once())->method('getItems')->willReturn([$this->createMock(\Crealoz\EasyAudit\Model\AuditRequest::class)]);
+
         $this->searchResultFactory->expects($this->once())->method('create')->willReturn($searchResult);
         $this->assertEquals($searchResult, $this->auditRequestRepository->getList($searchCriteria));
     }