MAGETWO-64889: [Performance] Optimize "Is Salable" check on Category page for Configurable Product

- Fix functional tests for configurable product

Author: xmav

dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View/ConfigurableOptions.php

@@ -8,10 +8,8 @@
 
 use Magento\Catalog\Test\Block\Product\View\CustomOptions;
 use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct;
-use Magento\Mtf\Client\Element;
 use Magento\Mtf\Client\Locator;
 use Magento\Mtf\Fixture\FixtureInterface;
-use Magento\Mtf\Fixture\InjectableFixture;
 use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
@@ -32,7 +30,7 @@ class ConfigurableOptions extends CustomOptions
      *
      * @var string
      */
-    protected $priceBlock = '//*[@class="product-info-main"]//*[contains(@class,"price-box")]';
+    protected $priceBlock = '.product-info-price .price-box';
 
     /**
      * Selector for tier prices.
@@ -160,10 +158,12 @@ private function getOptionTierPrices()
      */
     protected function getPriceBlock()
     {
-        return $this->blockFactory->create(
+        /** @var \Magento\Catalog\Test\Block\Product\Price $priceBlock */
+        $priceBlock = $this->blockFactory->create(
             \Magento\Catalog\Test\Block\Product\Price::class,
-            ['element' => $this->_rootElement->find($this->priceBlock, Locator::SELECTOR_XPATH)]
+            ['element' => $this->_rootElement->find($this->priceBlock)]
         );
+        return $priceBlock;
     }
 
     /**
@@ -213,4 +213,14 @@ public function getPresentOptions()
 
         return $options;
     }
+
+    /**
+     * Check if the options container is visible or not
+     *
+     * @return bool
+     */
+    public function isVisible()
+    {
+        return $this->_rootElement->find($this->optionsContext, Locator::SELECTOR_XPATH)->isVisible();
+    }
 }