MAGETWO-53159: [GitHub] Country of Manufacture drop down is limited #4579

Alexander Paliarush · Alexander Paliarush · commit a1d3f04ef555 · 2016-07-13T11:37:15.000-05:00
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml
@@ -213,8 +213,10 @@
                     <item name="Antarctica" xsi:type="string">AQ</item>
                     <item name="Canada" xsi:type="string">CA</item>
                     <item name="France" xsi:type="string">FR</item>
+                    <item name="Germany" xsi:type="string">DE</item>
                     <item name="Italy" xsi:type="string">IT</item>
                     <item name="Ukraine" xsi:type="string">UA</item>
+                    <item name="United Kingdom" xsi:type="string">GB</item>
                     <item name="United States" xsi:type="string">US</item>
                 </item>
             </field>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.php
@@ -85,7 +85,7 @@ public function testCreate(
 
         // Preconditions
         $this->objectManager->create(
-            'Magento\Config\Test\TestStep\SetupConfigurationStep',
+            \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
             ['configData' => $this->configData, 'flushCache' => $this->flushCache]
         )->run();
 
@@ -105,10 +105,9 @@ public function testCreate(
      */
     public function tearDown()
     {
-        // TODO: Make sure flush is invoked here
         $this->objectManager->create(
-            'Magento\Config\Test\TestStep\SetupConfigurationStep',
-            ['configData' => $this->configData, 'rollback' => true]
+            \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
+            ['configData' => $this->configData, 'rollback' => true, 'flushCache' => $this->flushCache]
         )->run();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Config/Test/TestStep/SetupConfigurationStep.php b/dev/tests/functional/tests/app/Magento/Config/Test/TestStep/SetupConfigurationStep.php
@@ -98,7 +98,6 @@ public function run()
         }
         
         if ($this->flushCache) {
-            // TODO: Does not work on rollback
             $this->adminCache->open();
             $this->adminCache->getActionsBlock()->flushMagentoCache();
             $this->adminCache->getMessagesBlock()->waitSuccessMessage();

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function testCreate(`
`85`	`85`
`86`	`86`	`// Preconditions`
`87`	`87`	`$this->objectManager->create(`
`88`		`- 'Magento\Config\Test\TestStep\SetupConfigurationStep',`
	`88`	`+ \Magento\Config\Test\TestStep\SetupConfigurationStep::class,`
`89`	`89`	`['configData' => $this->configData, 'flushCache' => $this->flushCache]`
`90`	`90`	`)->run();`
`91`	`91`
`@@ -105,10 +105,9 @@ public function testCreate(`
`105`	`105`	`*/`
`106`	`106`	`public function tearDown()`
`107`	`107`	`{`
`108`		`- // TODO: Make sure flush is invoked here`
`109`	`108`	`$this->objectManager->create(`
`110`		`- 'Magento\Config\Test\TestStep\SetupConfigurationStep',`
`111`		`- ['configData' => $this->configData, 'rollback' => true]`
	`109`	`+ \Magento\Config\Test\TestStep\SetupConfigurationStep::class,`
	`110`	`+ ['configData' => $this->configData, 'rollback' => true, 'flushCache' => $this->flushCache]`
`112`	`111`	`)->run();`
`113`	`112`	`}`
`114`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,6 @@ public function run()`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`if ($this->flushCache) {`
`101`		`- // TODO: Does not work on rollback`
`102`	`101`	`$this->adminCache->open();`
`103`	`102`	`$this->adminCache->getActionsBlock()->flushMagentoCache();`
`104`	`103`	`$this->adminCache->getMessagesBlock()->waitSuccessMessage();`