Merge remote-tracking branch 'mainline/2.1-develop' into MAGETWO-63226

Author: RuslanKostiv1

app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml

@@ -109,7 +109,7 @@
                         <argument name="at_call" xsi:type="string">getDescription</argument>
                         <argument name="at_code" xsi:type="string">description</argument>
                         <argument name="css_class" xsi:type="string">description</argument>
-                        <argument name="at_label" xsi:type="string">none</argument>
+                        <argument name="at_label" translate="true" xsi:type="string">none</argument>
                         <argument name="title" translate="true" xsi:type="string">Details</argument>
                     </arguments>
                 </block>

app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml

@@ -34,7 +34,7 @@ if ($_attributeType && $_attributeType == 'text') {
 
 <?php if ($_attributeValue): ?>
 <div class="product attribute <?php /* @escapeNotVerified */ echo $_className?>">
-    <?php if ($_attributeLabel != 'none'): ?><strong class="type"><?php /* @escapeNotVerified */ echo $_attributeLabel?></strong><?php endif; ?>
+    <?php if ($_attributeLabel != __('none')): ?><strong class="type"><?php /* @escapeNotVerified */ echo $_attributeLabel?></strong><?php endif; ?>
     <div class="value" <?php /* @escapeNotVerified */ echo $_attributeAddAttribute;?>><?php /* @escapeNotVerified */ echo $_attributeValue; ?></div>
 </div>
 <?php endif; ?>

app/design/frontend/Magento/blank/web/css/source/_layout.less

@@ -21,6 +21,7 @@
             .lib-vendor-prefix-flex-basis(100%);
             .lib-vendor-prefix-flex-grow(1);
             .lib-vendor-prefix-order(1);
+            width: 100%; 
         }
 
         .sidebar-main {

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Shipments/Grid.php

@@ -6,28 +6,29 @@
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Shipments;
 
+use Magento\Ui\Test\Block\Adminhtml\DataGrid;
+
 /**
- * Class Grid
- * Shipments grid on order view page
+ * Shipments grid on order view page.
  */
-class Grid extends \Magento\Backend\Test\Block\Widget\Grid
+class Grid extends DataGrid
 {
     /**
-     * Locator value for link in action column
+     * Locator value for link in action column.
      *
      * @var string
      */
     protected $editLink = '[data-column="real_shipment_id"]';
 
     /**
-     * Locator for shipment ids
+     * Locator for shipment ids.
      *
      * @var string
      */
     protected $shipmentId = 'tbody td:nth-child(2)';
 
     /**
-     * Filters array mapping
+     * Filters array mapping.
      *
      * @var array
      */
@@ -44,12 +45,13 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
     ];
 
     /**
-     * Get shipment ids
+     * Get shipment ids.
      *
      * @return array
      */
     public function getIds()
     {
+        $this->waitLoader();
         $result = [];
         $shipmentIds = $this->_rootElement->getElements($this->shipmentId);
         foreach ($shipmentIds as $shipmentId) {

dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Shipment/Grid.php

@@ -33,10 +33,10 @@ class Grid extends GridInterface
             'selector' => 'input[name="order_increment_id"]',
         ],
         'total_qty_from' => [
-            'selector' => 'input[name="total_qty[from]"',
+            'selector' => 'input[name="total_qty[from]"]',
         ],
         'total_qty_to' => [
-            'selector' => 'input[name="total_qty][to]"',
+            'selector' => 'input[name="total_qty[to]"]',
         ],
     ];
 }

dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsTab.php

@@ -39,12 +39,21 @@ public function processAssert(
 
         foreach ($ids['shipmentIds'] as $key => $shipmentId) {
             $filter = [
+                'id' => $shipmentId,
+                'qty' => number_format($totalQty[$key], 4, '.', ''),
+            ];
+            $filterQty = [
                 'id' => $shipmentId,
                 'qty_from' => $totalQty[$key],
                 'qty_to' => $totalQty[$key],
             ];
+            $salesOrderView->getOrderForm()->getTab('shipments')->getGridBlock()->search($filterQty);
             \PHPUnit_Framework_Assert::assertTrue(
-                $salesOrderView->getOrderForm()->getTab('shipments')->getGridBlock()->isRowVisible($filter),
+                $salesOrderView
+                    ->getOrderForm()
+                    ->getTab('shipments')
+                    ->getGridBlock()
+                    ->isRowVisible($filter, false),
                 'Shipment is absent on shipments tab.'
             );
         }

dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.xml

@@ -11,7 +11,7 @@
             <data name="initialRewrite/dataset" xsi:type="string">default</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
             <data name="urlRewrite/data/request_path" xsi:type="string">wishlist/%isolation%</data>
-            <data name="urlRewrite/data/target_path/entity" xsi:type="string">https://www.magentocommerce.com/magento-connect/</data>
+            <data name="urlRewrite/data/target_path/entity" xsi:type="string">https://marketplace.magento.com/</data>
             <data name="urlRewrite/data/redirect_type" xsi:type="string">Permanent (301)</data>
             <data name="urlRewrite/data/description" xsi:type="string">test_description_relative path</data>
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteSaveMessage" />