Fix issue with current store code

cdc21297 · Ivan Chepurnyi · f4397a13 · cdc21297 · cdc21297
Commit cdc21297 authored Oct 31, 2014 by Ivan Chepurnyi
2 changed files
--- a/app/code/community/EcomDev/PHPUnit/Test/Case/Util.php
+++ b/app/code/community/EcomDev/PHPUnit/Test/Case/Util.php
@@ -511,6 +511,7 @@ class EcomDev_PHPUnit_Test_Case_Util
    public static function setUp()
    {
        self::app()->resetDispatchedEvents();
+        self::$originalStore = Mage::app()->getStore()->getCode();
    }

    /**

--- a/app/code/community/EcomDev/PHPUnit/Test/Listener.php
+++ b/app/code/community/EcomDev/PHPUnit/Test/Listener.php
@@ -173,6 +173,9 @@ class EcomDev_PHPUnit_Test_Listener implements PHPUnit_Framework_TestListener
        ));

        if ($test instanceof PHPUnit_Framework_TestCase) {
+            EcomDev_PHPUnit_Helper::tearDown();
+            EcomDev_PHPUnit_Test_Case_Util::tearDown();
+            
            EcomDev_PHPUnit_Test_Case_Util::getFixture(get_class($test))
                ->setScope(EcomDev_PHPUnit_Model_FixtureInterface::SCOPE_LOCAL)
                ->discard(); // Clear applied fixture
@@ -180,9 +183,6 @@ class EcomDev_PHPUnit_Test_Listener implements PHPUnit_Framework_TestListener
            if (EcomDev_PHPUnit_Test_Case_Util::getExpectation(get_class($test))->isLoaded()) {
                EcomDev_PHPUnit_Test_Case_Util::getExpectation(get_class($test))->discard();
            }
-
-            EcomDev_PHPUnit_Test_Case_Util::tearDown();
-            EcomDev_PHPUnit_Helper::tearDown();
        }

        Mage::dispatchEvent('phpunit_test_end_after', array(