Merge pull request #18 from mage-one-com/develop

Fixes #17 and adds a test for emailService

Author: riconeitzel

src/app/code/community/Mageone/Qps/Model/Cron.php

@@ -17,11 +17,18 @@ class Mageone_Qps_Model_Cron
 
     public function __construct(array $args = [])
     {
+        $this->client = Mage::getModel('qps/http_client_curl');
         if (isset($args['client'])) {
             $this->client = $args['client'];
         }
-        $this->helper       = Mage::helper('qps');
+
         $this->emailService = Mage::getModel('qps/emailService');
+        if (isset($args['emailService'])) {
+            $this->emailService = $args['emailService'];
+        }
+
+        $this->helper = Mage::helper('qps');
+
     }
 
     /**
@@ -50,7 +57,7 @@ public function getRules(): void
                     'message' => $message,
                 ]
             );
-            if ($client->getStatus() !== 200) {
+            if ($client->getStatus() >= 300) {
                 Mage::log(
                     sprintf(
                         'Something went wrong while trying to update security rules, response: %s',
@@ -82,7 +89,7 @@ public function getRules(): void
                 $collection->walk('delete');
                 Mage::app()->cleanCache([Mageone_Qps_Model_Observer::QPS_CACHE_TAG]);
                 if ($sendNotification === true) {
-                    $this->emailService->sendNotificationEmail($this->helper);
+                    $this->emailService->sendNotificationEmail();
                 }
             }
         } catch (Exception $exception) {
@@ -96,7 +103,7 @@ public function getRules(): void
      */
     private function getClient()
     {
-        return $this->client ?: new Mageone_Qps_Model_HTTP_Client_Curl();
+        return $this->client;
     }
 
     /**

src/app/code/community/Mageone/Qps/Model/EmailService.php

@@ -1,12 +1,13 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 class Mageone_Qps_Model_EmailService
 {
 
-    public function sendNotificationEmail(Mageone_Qps_Helper_Data $helper): void
+    public function sendNotificationEmail(): void
     {
+        $helper = Mage::helper('qps');
         if ($helper->isNotificationEnabled() === false) {
             return;
         }

src/app/code/community/Mageone/Qps/Model/HTTP/Client/Curl.php renamed to src/app/code/community/Mageone/Qps/Model/Http/Client/Curl.php

@@ -45,13 +45,21 @@ class RuleUpdateTest extends AbstractTest
      * @var Mageone_Qps_Model_SecService
      */
     private $secService;
+    /**
+     * @var \Mageone_Qps_Model_EmailService|MockObject
+     */
+    private $emailServiceMock;
 
     protected function setUp(): void
     {
         parent::setUp();
-        $this->clientMock = $this->createMock(Mage_HTTP_IClient::class);
-        $this->cron       = Mage::getModel('qps/cron', ['client' => $this->clientMock]);
-        $this->secService = Mage::getModel('qps/secService');
+        $this->clientMock       = $this->createMock(\Mage_HTTP_IClient::class);
+        $this->emailServiceMock = $this->createMock(\Mageone_Qps_Model_EmailService::class);
+        $this->cron             = Mage::getModel(
+            'qps/cron',
+            ['client' => $this->clientMock, 'emailService' => $this->emailServiceMock]
+        );
+        $this->secService       = Mage::getModel('qps/secService');
 
         $this->helperMock->method('getUsername')->willReturn(self::EXAMPLE_USER);
         $this->helperMock->method('getResourceUrl')->willReturn(self::RESOURCE_URL);
@@ -113,6 +121,37 @@ public function testClientReturns200(): void
         $this->cron->getRules();
     }
 
+    public function testClientReturns100(): void
+    {
+        $secService       = $this->secService;
+        $validatePostData = (static function ($postData) use ($secService) {
+            if ($postData['user'] !== self::EXAMPLE_USER) {
+                return false;
+            }
+            $decrypt = $secService->decryptMessage($postData['message']);
+            try {
+                $message = json_decode($decrypt, true, 512, JSON_THROW_ON_ERROR);
+
+                return $message['magento_version'] === Mage::getVersion()
+                    && $message['patches_list'] === ['test-patch' => 'TEST patch'];
+            } catch (Exception $e) {
+                return false;
+            }
+        });
+
+        $this->clientMock
+            ->expects($this->once())
+            ->method('post')
+            ->with(self::RESOURCE_URL, $this->callback($validatePostData));
+
+        $this->clientMock
+            ->expects($this->once())
+            ->method('getStatus')
+            ->willReturn(100);
+
+        $this->cron->getRules();
+    }
+
     public function testClientReturnsNo200(): void
     {
         $this->clientMock
@@ -184,8 +223,10 @@ public function testRulesAreAutoEnabled($rules): void
      *
      * @param string[]
      */
-    public function testWriteNewRules($rules): void
+    public function testWriteNewRulesAndCallEmailService($rules): void
     {
+        $this->emailServiceMock->expects($this->once())->method('sendNotificationEmail');
+
         $this->clientMock
             ->method('getStatus')
             ->willReturn(200);