Merge pull request #663 from magento-fearless-kiwis/MAGETWO-61889-upgrade-tests

Oleksii Korshenko · web-flow · commit f28127b02187 · 2016-12-12T18:15:30.000-06:00
[Kiwi] MAGETWO-61927
diff --git a/dev/tests/functional/tests/app/Magento/Upgrade/Test/Block/SelectVersion.php b/dev/tests/functional/tests/app/Magento/Upgrade/Test/Block/SelectVersion.php
@@ -76,9 +76,6 @@ public function chooseVersionUpgradeOtherComponents($sampleDataVersion)
     {
         do {
             $this->iterateAndSetComponentsRows($this->convertVersionFixtureToRegexp($sampleDataVersion));
-            if ($this->canClickOnNextPage()) {
-                $this->clickOnNextPage();
-            }
         } while ($this->canClickOnNextPage());
     }
 
@@ -128,7 +125,9 @@ private function canClickOnNextPage()
     {
         $element = $this->_rootElement->find(".admin__data-grid-pager .action-next");
         if ($element->isVisible()) {
-            return !$element->isDisabled();
+            $result = !$element->isDisabled();
+            $this->clickOnNextPage();
+            return $result;
         }
         return false;
     }

Original file line number	Diff line number	Diff line change
`@@ -76,9 +76,6 @@ public function chooseVersionUpgradeOtherComponents($sampleDataVersion)`
`76`	`76`	`{`
`77`	`77`	`do {`
`78`	`78`	`$this->iterateAndSetComponentsRows($this->convertVersionFixtureToRegexp($sampleDataVersion));`
`79`		`- if ($this->canClickOnNextPage()) {`
`80`		`- $this->clickOnNextPage();`
`81`		`- }`
`82`	`79`	`} while ($this->canClickOnNextPage());`
`83`	`80`	`}`
`84`	`81`
`@@ -128,7 +125,9 @@ private function canClickOnNextPage()`
`128`	`125`	`{`
`129`	`126`	`$element = $this->_rootElement->find(".admin__data-grid-pager .action-next");`
`130`	`127`	`if ($element->isVisible()) {`
`131`		`- return !$element->isDisabled();`
	`128`	`+ $result = !$element->isDisabled();`
	`129`	`+ $this->clickOnNextPage();`
	`130`	`+ return $result;`
`132`	`131`	`}`
`133`	`132`	`return false;`
`134`	`133`	`}`