Merge branch 'mto-146' into pr2

Author: vitalysery

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar/Wishlist.php

@@ -9,7 +9,6 @@
 use Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities\Sidebar;
 use Magento\Mtf\Client\Locator;
 use Magento\Mtf\Fixture\InjectableFixture;
-use Magento\Downloadable\Test\Fixture\DownloadableProduct;
 
 /**
  * Wish List items block on backend.
@@ -132,8 +131,12 @@ public function selectWishlist($name)
      */
     public function selectItemToAddToOrder(InjectableFixture $product, $qty)
     {
+        $configureIcon = $this->_rootElement->find(
+            sprintf($this->addToOrderGrouped, $product->getName()),
+            Locator::SELECTOR_XPATH
+        )->isVisible();
         $productCheckoutData = $product->getData('checkout_data');
-        if (isset($productCheckoutData['options']) && !$product instanceof DownloadableProduct) {
+        if (isset($productCheckoutData['options']) && $configureIcon) {
             $this->_rootElement->find(
                 sprintf($this->addToOrderGrouped, $product->getName()),
                 Locator::SELECTOR_XPATH