MAGETWO-32302: Create New Order

- Fixed tests

Author: Oleg Zinoviev

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/qty.phtml

@@ -13,15 +13,9 @@
 <fieldset id="product_composite_configure_fields_qty"
           class="fieldset product-composite-qty-block admin__fieldset <?php echo $block->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
     <div class="field admin__field">
-        <label class="label admin__field-label">
-            <span><?php echo __('Quantity') ?></span>
-        </label>
+        <label class="label admin__field-label"><span><?php echo __('Quantity') ?></span></label>
         <div class="control admin__field-control">
-        	<input id="product_composite_configure_input_qty"
-                   class="input-text admin__control-text qty"
-                   type="text"
-                   name="qty"
-                   value="<?php echo $block->getQtyValue() * 1 ?>" />
+        	<input id="product_composite_configure_input_qty" class="input-text admin__control-text qty" type="text" name="qty" value="<?php echo $block->getQtyValue() * 1 ?>">
         </div>
     </div>
 </fieldset>

app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create.less

@@ -130,6 +130,11 @@
         .action-configure {
             float: right;
         }
+        .col-id,
+        .col-price,
+        .col-in_products {
+            width: 10rem;
+        }
     }
 }
 

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

@@ -85,7 +85,7 @@ class Create extends Block
      *
      * @var string
      */
-    protected $updateItems = '#order-items_grid p button';
+    protected $updateItems = '#order-items_grid button[onclick="order.itemsUpdate()"]';
 
     /**
      * 'Add Selected Product(s) to Order' button.

dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/CartTest.php

@@ -58,7 +58,7 @@ public function testConfigureAction()
         $this->getRequest()->setParam('id', $itemId);
         $this->dispatch('backend/customer/cart_product_composite_cart/configure');
         $this->assertContains(
-            '<input id="product_composite_configure_input_qty" class="input-text admin__control-text"'
+            '<input id="product_composite_configure_input_qty" class="input-text admin__control-text qty"'
             . ' type="text" name="qty" value="1">',
             $this->getResponse()->getBody()
         );

dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php

@@ -152,7 +152,7 @@ public function testConfigureProductToAddAction()
         $body = $this->getResponse()->getBody();
 
         $this->assertNotEmpty($body);
-        $this->assertContains('>Quantity</label>', $body);
+        $this->assertContains('><span>Quantity</span></label>', $body);
         $this->assertContains('>Test Configurable</label>', $body);
         $this->assertContains('"code":"test_configurable","label":"Test Configurable"', $body);
         $this->assertContains('"productId":"1"', $body);

lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php

@@ -415,10 +415,10 @@ public function getLabelHtml($idSuffix = '')
         if ($this->getLabel() !== null) {
             $html = '<label class="label admin__field-label" for="' .
                 $this->getHtmlId() . $idSuffix . '"' . $this->_getUiId(
-                'label'
-            ) . '><span>' . $this->_escape(
-                $this->getLabel()
-            ) . '</span></label>' . "\n";
+                    'label'
+                ) . '><span>' . $this->_escape(
+                    $this->getLabel()
+                ) . '</span></label>' . "\n";
         } else {
             $html = '';
         }