Merge remote-tracking branch 'origin/MAGETWO-56753' into BUGS

slavvka · slavvka · commit 9d425b7b8136 · 2016-09-09T15:00:42.000+03:00
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php
@@ -135,7 +135,7 @@ class DataGrid extends Grid
      *
      * @var string
      */
-    protected $sortLink = "//th[contains(@class, '%s')]/span[contains(text(), '%s')]";
+    protected $sortLink = './/div[@data-role="grid-wrapper"]//th[contains(@class, "%s")]/span[contains(text(), "%s")]';
 
     /**
      * Current page input.

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ class DataGrid extends Grid`
`135`	`135`	`*`
`136`	`136`	`* @var string`
`137`	`137`	`*/`
`138`		`- protected $sortLink = "//th[contains(@class, '%s')]/span[contains(text(), '%s')]";`
	`138`	`+ protected $sortLink = './/div[@data-role="grid-wrapper"]//th[contains(@class, "%s")]/span[contains(text(), "%s")]';`
`139`	`139`
`140`	`140`	`/**`
`141`	`141`	`* Current page input.`