Merge pull request #92 from magium/develop

Develop

Author: kschroeder

lib/Magento/Themes/Customer/AbstractThemeConfiguration.php

@@ -4,9 +4,8 @@
 
 
 use Magium\AbstractConfigurableElement;
-use Magium\Themes\ThemeConfigurationInterface;
 
-abstract class AbstractThemeConfiguration extends AbstractConfigurableElement implements ThemeConfigurationInterface
+abstract class AbstractThemeConfiguration extends AbstractConfigurableElement
 {
 
     public $accountNavigationXpath;
@@ -288,4 +287,4 @@ public function getLoginSubmitButton()
         return $this->loginSubmitButton;
     }
 
-}
+}

lib/Magento/Themes/OnePageCheckout/AbstractThemeConfiguration.php

@@ -6,7 +6,7 @@
 use Magium\AbstractConfigurableElement;
 use Magium\Themes\ThemeConfigurationInterface;
 
-abstract class AbstractThemeConfiguration extends AbstractConfigurableElement implements ThemeConfigurationInterface // ThemeConfigurationInterface is here simply for compatibility for extractors
+abstract class AbstractThemeConfiguration extends AbstractConfigurableElement
 {
 
     /**
@@ -737,4 +737,4 @@ public function getCartSummaryCheckoutProductLoopSubtotalXpath($itemCount)
         return $this->translatePlaceholders($return);
     }
 
-}
+}

tests/Magento/AbstractMagentoTestCase/TranslatorTest.php

@@ -40,7 +40,7 @@ public function testCustomLocaleSet()
 
     public function testOnWebpage()
     {
-//        self::markTestSkipped('This test requires the German language pack.  This test will fail unless you have that optional feature installed');
+        self::markTestSkipped('This test requires the German language pack.  This test will fail unless you have that optional feature installed');
         $translator = $this->getTranslator();
         $translator->addTranslationCsvFile(__DIR__ . '/translation.csv', 'en_US');
         $translator->addTranslationCsvFile(__DIR__ . '/translation.de_DE.csv', 'de_DE');
@@ -53,4 +53,4 @@ public function testOnWebpage()
         $this->getNavigator(AccountHome::NAVIGATOR)->navigateTo();
     }
 
-}
+}