Merge pull request #538 from magento-tango/MAGETWO-60107

magicbunneh · web-flow · commit d555891ab2a2 · 2016-10-27T14:55:30.000+03:00
Bugs:
* MAGETWO-59702: [FT] Magento\Customer\Test\TestCase\RegisterCustomerFrontendEntityTest fails randomly on CI
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Template.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Template.php
@@ -19,7 +19,7 @@ class Template extends Block
      *
      * @var string
      */
-    protected $spinner = '[data-role="spinner"]';
+    protected $spinner = '#container [data-role="spinner"]';
 
     /**
      * Magento loader.
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
@@ -165,7 +165,7 @@ public function resetFilter()
      */
     protected function waitFilterToLoad()
     {
-        $this->getTemplateBlock()->waitForElementNotVisible($this->loader);
+        $this->getTemplateBlock()->waitLoader();
         $browser = $this->_rootElement;
         $selector = $this->filterButton . ', ' . $this->resetButton;
         $browser->waitUntil(

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class Template extends Block`
`19`	`19`	`*`
`20`	`20`	`* @var string`
`21`	`21`	`*/`
`22`		`- protected $spinner = '[data-role="spinner"]';`
	`22`	`+ protected $spinner = '#container [data-role="spinner"]';`
`23`	`23`
`24`	`24`	`/**`
`25`	`25`	`* Magento loader.`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ public function resetFilter()`
`165`	`165`	`*/`
`166`	`166`	`protected function waitFilterToLoad()`
`167`	`167`	`{`
`168`		`- $this->getTemplateBlock()->waitForElementNotVisible($this->loader);`
	`168`	`+ $this->getTemplateBlock()->waitLoader();`
`169`	`169`	`$browser = $this->_rootElement;`
`170`	`170`	`$selector = $this->filterButton . ', ' . $this->resetButton;`
`171`	`171`	`$browser->waitUntil(`