Merge c30a05a into MAGETWO-63116_JSON_ERROR

Author: Magento CICD

app/code/Magento/Catalog/Model/Category.php

@@ -116,6 +116,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      * URL rewrite model
      *
      * @var \Magento\UrlRewrite\Model\UrlRewrite
+     * @deprecated since 2.2.0
      */
     protected $_urlRewrite;
 

app/code/Magento/CatalogUrlRewrite/Model/Map/DatabaseMapInterface.php

@@ -5,8 +5,6 @@
  */
 namespace Magento\CatalogUrlRewrite\Model\Map;
 
-use Magento\Framework\DB\Select;
-
 /**
  * Interface for a mysql data type of a map
  *

app/code/Magento/Indexer/Model/Processor/Handler.php

@@ -11,6 +11,7 @@
  * This class is to be used as a container for new generated url rewrites by adding new ones using merge method
  * Removes duplicates for a set/array of Url Rewrites based on the unique key of the url_rewrites table
  *
+ * @api
  */
 class MergeDataProvider
 {

app/code/Magento/UrlRewrite/Model/MergeDataProvider.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\UrlRewrite\Model;
 
+/**
+ * @api
+ */
 interface StorageInterface extends UrlFinderInterface, UrlPersistInterface
 {
 }

app/code/Magento/UrlRewrite/Model/StorageInterface.php

@@ -7,6 +7,7 @@
 
 /**
  * Url Finder Interface
+ * @api
  */
 interface UrlFinderInterface
 {

app/code/Magento/UrlRewrite/Model/UrlFinderInterface.php

@@ -7,6 +7,7 @@
 
 /**
  * Url Persist Interface
+ * @api
  */
 interface UrlPersistInterface
 {

app/code/Magento/UrlRewrite/Model/UrlPersistInterface.php

@@ -11,6 +11,7 @@
 
 /**
  * Data abstract class for url storage
+ * @api
  */
 class UrlRewrite extends AbstractSimpleObject
 {

app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php

@@ -72,6 +72,13 @@ class ProductForm extends FormSections
      */
     protected $newAttributeModal = '.product_form_product_form_add_attribute_modal_create_new_attribute_modal';
 
+    /**
+     * Website checkbox xpath selector.
+     *
+     * @var string
+     */
+    protected $websiteCheckbox = '//label[text()="%s"]/../input';
+
     /**
      * Fill the product form.
      *
@@ -138,6 +145,17 @@ public function openSection($sectionName)
         return $this;
     }
 
+    /**
+     * Unassign product from website by website name.
+     *
+     * @param string $name
+     */
+    public function unassignFromWebsite($name)
+    {
+        $this->openSection('websites');
+        $this->_rootElement->find(sprintf($this->websiteCheckbox, $name), Locator::SELECTOR_XPATH)->click();
+    }
+
     /**
      * Wait page to load.
      *

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php

@@ -12,5 +12,6 @@
     <block name="addAttributeModal" class="Magento\Catalog\Test\Block\Adminhtml\Product\Modal\AddAttribute" locator=".product_form_product_form_add_attribute_modal" strategy="css selector"/>
     <block name="newAttributeModal" class="Magento\Catalog\Test\Block\Adminhtml\Product\Modal\NewAttribute" locator=".product_form_product_form_add_attribute_modal_create_new_attribute_modal" strategy="css selector"/>
     <block name="productForm" class="Magento\Catalog\Test\Block\Adminhtml\Product\ProductForm" locator="[id='page:main-container']" strategy="css selector"/>
+    <block name="storeSwitcherBlock" class="Magento\Store\Test\Block\Switcher" locator=".store-switcher" strategy="css selector" />
   </page>
 </config>