MAGETWO-39479: Pull request processing

sivaschenko · sivaschenko · commit 6d7612cb7078 · 2015-07-08T16:44:35.000+03:00
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php
@@ -100,11 +100,11 @@ public function getPurchasePointStoreGroups()
     {
         $this->openFilterBlock();
         $storeGroupElements = $this->_rootElement->find($this->purchasePointFilter)
-            ->getElements('.//optgroup[./option]', Locator::SELECTOR_XPATH);
+            ->getElements('//option/preceding-sibling::optgroup[1]', Locator::SELECTOR_XPATH);
         $result = [];
 
         foreach ($storeGroupElements as $storeGroupElement) {
-            $result[] = trim($storeGroupElement->getAttribute('label'), ' ');
+            $result[] = trim($storeGroupElement->getAttribute('label'));
         }
 
         return $result;

Original file line number	Diff line number	Diff line change
`@@ -100,11 +100,11 @@ public function getPurchasePointStoreGroups()`
`100`	`100`	`{`
`101`	`101`	`$this->openFilterBlock();`
`102`	`102`	`$storeGroupElements = $this->_rootElement->find($this->purchasePointFilter)`
`103`		`- ->getElements('.//optgroup[./option]', Locator::SELECTOR_XPATH);`
	`103`	`+ ->getElements('//option/preceding-sibling::optgroup[1]', Locator::SELECTOR_XPATH);`
`104`	`104`	`$result = [];`
`105`	`105`
`106`	`106`	`foreach ($storeGroupElements as $storeGroupElement) {`
`107`		`- $result[] = trim($storeGroupElement->getAttribute('label'), ' ');`
	`107`	`+ $result[] = trim($storeGroupElement->getAttribute('label'));`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`return $result;`