Fix issue with current store code

EcomDev · Oct 31, 2014 · cdc2129 · cdc2129
1 parent f4397a1
commit cdc2129
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/code/community/EcomDev/PHPUnit/Test/Case/Util.php b/app/code/community/EcomDev/PHPUnit/Test/Case/Util.php
@@ -511,6 +511,7 @@ public static function getGroupedClassMockBuilder(PHPUnit_Framework_TestCase $te
     public static function setUp()
     {
         self::app()->resetDispatchedEvents();
+        self::$originalStore = Mage::app()->getStore()->getCode();
     }
 
     /**

diff --git a/app/code/community/EcomDev/PHPUnit/Test/Listener.php b/app/code/community/EcomDev/PHPUnit/Test/Listener.php
@@ -173,16 +173,16 @@ public function endTest(PHPUnit_Framework_Test $test, $time)
         ));
 
         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
 
             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(