MTA-2723: Functional test maintenance. Part 2

Author: Dmytro Aponasenko

dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar/Item.php

@@ -47,6 +47,7 @@ public function removeItemFromMiniCart()
         /** @var \Magento\Ui\Test\Block\Adminhtml\Modal $modal */
         $modal = $this->blockFactory->create('Magento\Ui\Test\Block\Adminhtml\Modal', ['element' => $element]);
         $modal->acceptAlert();
+        $modal->waitModalWindowToDisappear();
     }
 
     /**

dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/ResourcesPopup.php

@@ -23,7 +23,7 @@ class ResourcesPopup extends Form
      *
      * @var string
      */
-    protected $allowButtonSelector = '[data-row-dialog="tokens"][role="button"]';
+    protected $allowButtonSelector = '[data-row-dialog="tokens"][type="button"]';
 
     /**
      * Selector for "Reauthorize" button.

dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/TokensPopup.php

@@ -18,7 +18,7 @@ class TokensPopup extends Form
      *
      * @var string
      */
-    protected $doneButtonSelector = '.action-primary[role="button"]';
+    protected $doneButtonSelector = '.action-primary[type="button"]';
 
     /**
      * Click Done button on Integration tokens popup window.

dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveAndGenerateMessages.php

@@ -28,7 +28,7 @@ class AssertSitemapSuccessSaveAndGenerateMessages extends AbstractConstraint
      */
     public function processAssert(SitemapIndex $sitemapIndex, Sitemap $sitemap)
     {
-        $actualMessages = $sitemapIndex->getMessagesBlock()->getSuccessMessage();
+        $actualMessages = $sitemapIndex->getMessagesBlock()->getSuccessMessages();
         \PHPUnit_Framework_Assert::assertTrue(
             in_array(self::SUCCESS_SAVE_MESSAGE, $actualMessages) &&
             in_array(sprintf(self::SUCCESS_GENERATE_MESSAGE, $sitemap->getSitemapFilename()), $actualMessages),

dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteAndBackupMessages.php

@@ -33,7 +33,7 @@ class AssertStoreGroupSuccessDeleteAndBackupMessages extends AbstractConstraint
      */
     public function processAssert(StoreIndex $storeIndex)
     {
-        $actualMessages = $storeIndex->getMessagesBlock()->getSuccessMessage();
+        $actualMessages = $storeIndex->getMessagesBlock()->getSuccessMessages();
         \PHPUnit_Framework_Assert::assertTrue(
             in_array(self::SUCCESS_BACKUP_MESSAGE, $actualMessages) &&
             in_array(self::SUCCESS_DELETE_MESSAGE, $actualMessages),

dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteAndBackupMessages.php

@@ -33,7 +33,7 @@ class AssertStoreSuccessDeleteAndBackupMessages extends AbstractConstraint
      */
     public function processAssert(StoreIndex $storeIndex)
     {
-        $actualMessages = $storeIndex->getMessagesBlock()->getSuccessMessage();
+        $actualMessages = $storeIndex->getMessagesBlock()->getSuccessMessages();
         \PHPUnit_Framework_Assert::assertTrue(
             in_array(self::SUCCESS_BACKUP_MESSAGE, $actualMessages) &&
             in_array(self::SUCCESS_DELETE_MESSAGE, $actualMessages),

dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/Modal.php

@@ -56,7 +56,6 @@ class Modal extends Block
     public function acceptAlert()
     {
         $this->_rootElement->find($this->acceptButtonSelector)->click();
-        $this->waitModalWindowToDisappear();
     }
 
     /**
@@ -67,7 +66,6 @@ public function acceptAlert()
     public function dismissAlert()
     {
         $this->_rootElement->find($this->dismissButtonSelector)->click();
-        $this->waitModalWindowToDisappear();
     }
 
     /**
@@ -78,7 +76,6 @@ public function dismissAlert()
     public function closeAlert()
     {
         $this->_rootElement->find($this->closeButtonSelector)->click();
-        $this->waitModalWindowToDisappear();
     }
 
     /**
@@ -107,7 +104,7 @@ public function setAlertText($text)
      *
      * @return void
      */
-    protected function waitModalWindowToDisappear()
+    public function waitModalWindowToDisappear()
     {
         $this->browser->waitUntil(
             function () {

dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/Role/Tab/User/Grid.php

@@ -30,5 +30,5 @@ class Grid extends AbstractGrid
      *
      * @var string
      */
-    protected $selectItem = '.col-in_role_users > input';
+    protected $selectItem = '.col-in_role_users input';
 }