add integration test and fix onDeactivate method

patrick-blom · Apr 9, 2020 · 42d4875 · 42d4875
1 parent 5c3952c
commit 42d4875
Show file tree

Hide file tree

Showing 4 changed files with 105 additions and 11 deletions.
diff --git a/Core/Email.php b/Core/Email.php
@@ -126,7 +126,7 @@ public function clearAllCarbonCopies(): void
      *
      * @return string
      */
-    protected function idnToAscii($idn)
+    private function idnToAscii($idn)
     {
         if (function_exists('idn_to_ascii')) {
             // for old PHP versions support

diff --git a/Core/MultiOrderMailReceiver.php b/Core/MultiOrderMailReceiver.php
@@ -23,7 +23,7 @@ public static function onActivate(): void
     {
         $dbMetaDataHandler = oxNew(DbMetaDataHandler::class);
 
-        if (!$dbMetaDataHandler->fieldExists('PBOWNEREMAILRECEIVER', 'oxshops')) {
+        if ( ! $dbMetaDataHandler->fieldExists('PBOWNEREMAILRECEIVER', 'oxshops')) {
             DatabaseProvider::getDb()->execute(
                 "ALTER TABLE oxshops ADD PBOWNEREMAILRECEIVER text NOT NULL default '' COMMENT 'Additional recipients for order owner mail';"
             );
@@ -36,13 +36,27 @@ public static function onActivate(): void
     public static function onDeactivate(): void
     {
         $container = ContainerFactory::getInstance()->getContainer();
+        /** @var QueryBuilderFactoryInterface $queryBuilderFactory */
         $queryBuilderFactory = $container->get(QueryBuilderFactoryInterface::class);
+        $queryBuilder        = $queryBuilderFactory->create();
 
-        $queryBuilder = $queryBuilderFactory->create();
-        $queryBuilder->delete('oxtplblocks', 'tpl')
-            ->where('tpl.oxmodule = :moduleId')
-            ->setParameters([
-                'moduleId' => 'multiordermailreceiver'
-            ]);
+        $queryBuilder->select('oxid')
+                     ->from('oxtplblocks')
+                     ->where('oxmodule = :moduleId')
+                     ->setParameters([
+                         'moduleId' => 'multiordermailreceiver'
+                     ]);
+
+        $row = $queryBuilder->execute()->fetch();
+
+        // deletes are only allowed by primarykey
+        if (count($row) > 0 && array_key_exists('oxid', $row)) {
+            $queryBuilder->delete('oxtplblocks')
+                         ->where('oxid = :id')
+                         ->setParameters([
+                             'id' => $row['oxid']
+                         ]);
+            $queryBuilder->execute();
+        }
     }
 }
diff --git a/Tests/Integration/Core/MultiOrderMailReceiverTest.php b/Tests/Integration/Core/MultiOrderMailReceiverTest.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace PaBlo\MultiOrderMailReceiver\Test\Integration\Core;
+
+use OxidEsales\Eshop\Core\DbMetaDataHandler;
+use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
+use OxidEsales\EshopCommunity\Internal\Framework\Database\QueryBuilderFactoryInterface;
+use OxidEsales\TestingLibrary\UnitTestCase;
+use PaBlo\MultiOrderMailReceiver\Core\MultiOrderMailReceiver;
+
+
+/**
+ * Class MultiOrderMailReceiverTest
+ * UNIT/INTEGRATION tests for core class MultiOrderMailReceiver.
+ *
+ * @package PaBlo\MultiOrderMailReceiver\Test\Integration\Core
+ */
+class MultiOrderMailReceiverTest extends UnitTestCase
+{
+    /**
+     * Subject under the test.
+     *
+     * @var MultiOrderMailReceiver
+     */
+    protected $SUT;
+
+    /**
+     * Set SUT state before test.
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->SUT = new MultiOrderMailReceiver();
+    }
+
+    /**
+     * @covers \PaBlo\MultiOrderMailReceiver\Core\MultiOrderMailReceiver::onActivate
+     */
+    public function testOnActivate_willAddCustomFieldToTheDatabase(): void
+    {
+        // ensure field does not exists
+        $dbMetaDataHandler = oxNew(DbMetaDataHandler::class);
+        $dbMetaDataHandler->executeSql(['ALTER TABLE oxshops DROP PBOWNEREMAILRECEIVER;']);
+        $this->assertFalse($dbMetaDataHandler->fieldExists('PBOWNEREMAILRECEIVER', 'oxshops'));
+
+        $this->SUT::onActivate();
+        $this->assertTrue($dbMetaDataHandler->fieldExists('PBOWNEREMAILRECEIVER', 'oxshops'));
+    }
+
+    /**
+     * @covers \PaBlo\MultiOrderMailReceiver\Core\MultiOrderMailReceiver::onDeactivate
+     */
+    public function testOnDeactivate_willRemoveTemplateBlocks(): void
+    {
+        $container = ContainerFactory::getInstance()->getContainer();
+
+        // ensure the module is active
+        /** @var QueryBuilderFactoryInterface $queryBuilderFactory */
+        $queryBuilderFactory = $container->get(QueryBuilderFactoryInterface::class);
+
+        $queryBuilder = $queryBuilderFactory->create();
+        $queryBuilder->select('oxid')
+                     ->from('oxtplblocks', 'tpl')
+                     ->where('tpl.oxmodule = :moduleId')
+                     ->setParameters([
+                         'moduleId' => 'multiordermailreceiver'
+                     ]);
+
+        $result = $queryBuilder->execute()->fetchAll();
+        $this->assertCount(1, $result);
+
+        $this->SUT::onDeactivate();
+
+        $result = $queryBuilder->execute()->fetchAll();
+        $this->assertCount(0, $result);
+    }
+}
+
diff --git a/Tests/Unit/Core/EmailTest.php b/Tests/Unit/Core/EmailTest.php
@@ -2,7 +2,6 @@
 
 namespace PaBlo\MultiOrderMailReceiver\Test\Unit\Core;
 
-
 use OxidEsales\Eshop\Application\Model\Order;
 use OxidEsales\TestingLibrary\UnitTestCase;
 use PaBlo\MultiOrderMailReceiver\Core\Email;
@@ -30,8 +29,8 @@ public function setUp()
         parent::setUp();
 
         $this->SUT = $this->getMockBuilder(Email::class)
-            ->setMethods(['__call'])
-            ->getMock();
+                          ->setMethods(['__call', 'send', 'getRenderer'])
+                          ->getMock();
     }
 
     /**
@@ -168,4 +167,6 @@ public function testIdnToAscii_willReturnNormalString(): void
         $result = $reflectedMethod->invokeArgs($this->SUT, ['täst.de']);
         $this->assertSame('xn--tst-qla.de', $result);
     }
+
+
 }