Dev

.travis.yml

@@ -2,7 +2,9 @@ language: php
 php:
   - 5.3
   - 5.4
+  - 5.5
 env:
+  - MAGE=1.9.1.0
   - MAGE=1.9.0.1
   - MAGE=1.8.1.0
   - MAGE=1.7.0.2

README.md

@@ -5,7 +5,7 @@ Magento PHPUnit Integration
 
 Magento is a quite complex platform without built in unit test suite, so the code is not oriented on running tests over it.
 
-This extension was created especially for resolving this problem and promoting test driven development practices in Magento developers community. It doesn't change core files or brake your Magento instalment database, because all the system objects are replaced during the run-time with the test ones and a separate database connection is used for tests.
+This extension was created especially for resolving this problem and promoting test driven development practices in Magento developers community. It doesn't change core files or break your Magento installation database. All system objects are replaced during run-time with the test objects, and a separate database connection is used for tests.
 
 System Requirements
 -------------------

app/code/community/EcomDev/PHPUnit/Controller/Request/Http.php

@@ -158,6 +158,7 @@ public function resetInternalProperties()
         // From Http request
         $this->_paramSources = array('_GET', '_POST');
         $this->_requestUri = null;
+        $this->_params = array();
         $this->_baseUrl = null;
         $this->_basePath = null;
         $this->_pathInfo = '';
@@ -174,6 +175,7 @@ public function resetInternalProperties()
         $this->_route = null;
         $this->_directFrontNames = null;
         $this->_controllerModule = null;
+        $this->_beforeForwardInfo = null;
         return $this;
     }
 

app/code/community/EcomDev/PHPUnit/Model/App.php

@@ -59,35 +59,11 @@ class EcomDev_PHPUnit_Model_App extends Mage_Core_Model_App
     const XML_PATH_CONTROLLER_RESPONSE = 'phpunit/suite/controller/response/class';
 
     /**
-     * Old configuration model to be returned back
-     * after unit tests are finished
-     *
-     * @var Mage_Core_Model_Config
-     */
-    protected static $_oldConfig = null;
-
-    /**
-     * Old application model to be returned back
-     * after unit tests are finished
-     *
-     * @var Mage_Core_Model_App
-     */
-    protected static $_oldApplication = null;
-
-    /**
-     * Old event collection to be returned back
-     * after the unit tests are finished
-     *
-     * @var Varien_Event_Collection
-     */
-    protected static $_oldEventCollection = null;
-
-    /**
-     * List of singletons in original application
+     * Test scope data to be returned back after unit tests are finished
      *
      * @var array
      */
-    protected static $_oldRegistry = null;
+    protected static $_testScopeStack = array();
 
     /**
      * Configuration model class name for unit tests
@@ -143,10 +119,12 @@ class EcomDev_PHPUnit_Model_App extends Mage_Core_Model_App
     public static function applyTestScope()
     {
         // Save old environment variables
-        self::$_oldApplication = EcomDev_Utils_Reflection::getRestrictedPropertyValue('Mage', '_app');
-        self::$_oldConfig = EcomDev_Utils_Reflection::getRestrictedPropertyValue('Mage', '_config');
-        self::$_oldEventCollection = EcomDev_Utils_Reflection::getRestrictedPropertyValue('Mage', '_events');
-        self::$_oldRegistry = EcomDev_Utils_Reflection::getRestrictedPropertyValue('Mage', '_registry');
+        self::$_testScopeStack[] = array(
+            'app'      => EcomDev_Utils_Reflection::getRestrictedPropertyValue('Mage', '_app'),
+            'config'   => EcomDev_Utils_Reflection::getRestrictedPropertyValue('Mage', '_config'),
+            'events'   => EcomDev_Utils_Reflection::getRestrictedPropertyValue('Mage', '_events'),
+            'registry' => EcomDev_Utils_Reflection::getRestrictedPropertyValue('Mage', '_registry'),
+        );
 
 
         // Setting environment variables for unit tests
@@ -156,7 +134,20 @@ public static function applyTestScope()
         EcomDev_Utils_Reflection::setRestrictedPropertyValue('Mage', '_registry', array());
 
         // All unit tests will be run in admin scope, to get rid of frontend restrictions
-        Mage::app()->initTest();
+        // Init modules runs install process for table structures,
+        // It is required for setting up proper setup script
+        try {
+            set_error_handler(function ($errorCode, $errorMessage) {
+                echo $errorMessage, $errorCode;
+                debug_print_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+                exit;
+            });
+            Mage::app()->initTest();
+            restore_error_handler();
+        } catch (Exception $e) {
+            echo $e->getMessage(), "\n", $e->getTraceAsString();
+            exit;
+        }
     }
 
     /**
@@ -225,10 +216,10 @@ public function initTest()
         $this->replaceRegistry(self::REGISTRY_PATH_SHARED_STORAGE, new Varien_Object());
         return $this;
     }
-    
+
     /**
      * Sets cache options for test case
-     * 
+     *
      * @param array $options
      * @return EcomDev_PHPUnit_Model_App
      */
@@ -243,7 +234,7 @@ public function setCacheOptions(array $options)
 
     /**
      * Retrieve cache options for test case
-     * 
+     *
      * @return array
      */
     public function getCacheOptions()
@@ -358,7 +349,7 @@ public function removeEventArea($code)
 
     /**
      * Returns request for test suite
-     * 
+     *
      * @see Mage_Core_Model_App::getRequest()
      * @return EcomDev_PHPUnit_Controller_Request_Http
      */
@@ -376,7 +367,7 @@ public function getRequest()
 
     /**
      * Returns response for test suite
-     * 
+     *
      * @see Mage_Core_Model_App::getResponse()
      * @return EcomDev_PHPUnit_Controller_Response_Http
      */
@@ -405,7 +396,6 @@ public function getResponse()
     protected function _getClassNameFromConfig($configPath, $interface = null)
     {
         $className = (string)$this->getConfig()->getNode($configPath);
-
         $reflection = EcomDev_Utils_Reflection::getReflection($className);
         if ($interface !== null && !$reflection->implementsInterface($interface)) {
             throw new RuntimeException(
@@ -434,11 +424,17 @@ protected function _initStores()
      */
     public static function discardTestScope()
     {
+        if(empty(self::$_testScopeStack)) {
+            throw new RuntimeException('No test scope to discard');
+        }
+
+        $previousScope = array_pop(self::$_testScopeStack);
+
         // Setting environment variables for unit tests
-        EcomDev_Utils_Reflection::setRestrictedPropertyValue('Mage', '_app', self::$_oldApplication);
-        EcomDev_Utils_Reflection::setRestrictedPropertyValue('Mage', '_config', self::$_oldConfig);
-        EcomDev_Utils_Reflection::setRestrictedPropertyValue('Mage', '_events', self::$_oldEventCollection);
-        EcomDev_Utils_Reflection::setRestrictedPropertyValue('Mage', '_registry', self::$_oldRegistry);
+        EcomDev_Utils_Reflection::setRestrictedPropertyValue('Mage', '_app', $previousScope['app']);
+        EcomDev_Utils_Reflection::setRestrictedPropertyValue('Mage', '_config', $previousScope['config']);
+        EcomDev_Utils_Reflection::setRestrictedPropertyValue('Mage', '_events', $previousScope['events']);
+        EcomDev_Utils_Reflection::setRestrictedPropertyValue('Mage', '_registry', $previousScope['registry']);
     }
 
     /**
@@ -527,14 +523,14 @@ public function dispatchEvent($eventName, $args)
     {
         if ($this->_eventsEnabled) {
             parent::dispatchEvent($eventName, $args);
+        }
 
-            if (!isset($this->_dispatchedEvents[$eventName])) {
-                $this->_dispatchedEvents[$eventName] = 0;
-            }
-
-            $this->_dispatchedEvents[$eventName]++;
+        if (!isset($this->_dispatchedEvents[$eventName])) {
+            $this->_dispatchedEvents[$eventName] = 0;
         }
 
+        $this->_dispatchedEvents[$eventName]++;
+
         return $this;
     }
 

app/code/community/EcomDev/PHPUnit/Model/Fixture/Processor/Tables.php

@@ -107,7 +107,7 @@ public function discard(array $data, $key, EcomDev_PHPUnit_Model_FixtureInterfac
             $this->getResource()->cleanTable($tableEntity);
         }
         foreach (array_keys($data) as $tableEntity) {
-            if (isset($restoreTableData[$tableEntity])) {
+            if ( ! empty($restoreTableData[$tableEntity])) {
                 $this->getResource()->loadTableData($tableEntity, $restoreTableData[$tableEntity]);
             }
         }

app/code/community/EcomDev/PHPUnit/Model/Layout.php

@@ -532,6 +532,15 @@ public function isLoaded()
     public function getOutput()
     {
         $this->record(self::ACTION_RENDER, 'layout');
-        return parent::getOutput();
+
+        // parent::getOutput() with Inchoo_PHP7 fix:
+        $out = '';
+        if (!empty($this->_output)) {
+            foreach ($this->_output as $callback) {
+                $out .= $this->getBlock($callback[0])->{$callback[1]}();
+            }
+        }
+
+        return $out;
     }
 }

app/code/community/EcomDev/PHPUnit/Model/Mysql4/Fixture/AbstractEav.php

@@ -255,7 +255,7 @@ public function loadEntity($entityType, $values)
                     $defaultAttributeSet = 0;
                 }
 
-                $values[$index]['attribute_set_id'] = $defaultAttributeSet;
+                $row['attribute_set_id'] = $defaultAttributeSet;
             }
 
             // Preparing entity table record

app/code/community/EcomDev/PHPUnit/Test/Case/Controller.php

@@ -1160,7 +1160,7 @@ public static function assertLayoutBlockRenderedContent($blockName,
         self::assertThatLayout(
             self::layoutBlock(
                 $blockName,
-                EcomDev_PHPUnit_Constraint_Layout_Block::TYPE_RENDERED,
+                EcomDev_PHPUnit_Constraint_Layout_Block::TYPE_RENDERED_CONTENT,
                 $constraint
             ),
             $message
@@ -1180,7 +1180,7 @@ public static function assertLayoutBlockRenderedContentNot($blockName,
         self::assertThatLayout(
             self::layoutBlock(
                 $blockName,
-                EcomDev_PHPUnit_Constraint_Layout_Block::TYPE_RENDERED,
+                EcomDev_PHPUnit_Constraint_Layout_Block::TYPE_RENDERED_CONTENT,
                 self::logicalNot($constraint)
             ),
             $message