MTA-3108: Fix CE and EE

- fixed many tests

Author: vgoncharenko

dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/PromoForm.xml

@@ -30,7 +30,7 @@
         <strategy>xpath</strategy>
         <fields>
             <conditions>
-                <selector>#catalog_rule_formrule_conditions_fieldset_</selector>
+                <selector>[id^="catalog_rule_formrule_conditions_fieldset_"]</selector>
                 <input>conditions</input>
             </conditions>
         </fields>

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

@@ -19,7 +19,7 @@ class CartEmpty extends Block
      *
      * @var string
      */
-    private $linkToMainPage = './/a';
+    private $linkToMainPage = 'p a';
 
     /**
      * CSS selector for message text.
@@ -50,6 +50,6 @@ public function getText()
      */
     public function clickLinkToMainPage()
     {
-        $this->_rootElement->find($this->linkToMainPage, Locator::SELECTOR_XPATH)->click();
+        $this->_rootElement->find($this->linkToMainPage)->click();
     }
 }

dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php

@@ -36,6 +36,13 @@ class UpdateProductFromMiniShoppingCartEntityTest extends Injectable
     const TEST_TYPE = 'extended_acceptance_test';
     /* end tags */
 
+    /**
+     * Catalog product view page.
+     *
+     * @var CatalogProductView
+     */
+    protected $catalogProductView;
+
     /**
      * Cms index page.
      *
@@ -54,12 +61,17 @@ class UpdateProductFromMiniShoppingCartEntityTest extends Injectable
      * Inject data.
      *
      * @param CmsIndex $cmsIndex
+     * @param CatalogProductView $catalogProductView
      * @param FixtureFactory $fixtureFactory
      * @return void
      */
-    public function __inject(CmsIndex $cmsIndex, FixtureFactory $fixtureFactory)
-    {
+    public function __inject(
+        CmsIndex $cmsIndex,
+        CatalogProductView $catalogProductView,
+        FixtureFactory $fixtureFactory
+    ) {
         $this->cmsIndex = $cmsIndex;
+        $this->catalogProductView = $catalogProductView;
         $this->fixtureFactory = $fixtureFactory;
     }
 
@@ -82,8 +94,8 @@ public function test($originalProduct, $checkoutData)
         $newProduct = $this->createProduct(explode('::', $originalProduct)[0], [$productData]);
         $miniShoppingCart = $this->cmsIndex->getCartSidebarBlock();
         $miniShoppingCart->openMiniCart();
-        $miniShoppingCart->getCartItem($newProduct)->editQty($newProduct->getCheckoutData());
         $miniShoppingCart->getCartItem($newProduct)->clickEditItem();
+        $this->catalogProductView->getViewBlock()->addToCart($newProduct);
 
         // Prepare data for asserts:
         $cart['data']['items'] = ['products' => [$newProduct]];