MAGETWO-52571: [Github][PR] Add HttpInterface methods and add up-casts for type safety #3746

 - Merge branch 'develop' into okapis-pr-branch

Author: Oleksii Korshenko

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php

@@ -154,8 +154,8 @@ protected function getFieldsForFieldset()
         $tooltip = [
             'link' => 'http://docs.magento.com/m2/ce/user_guide/configuration/scope.html',
             'description' => __(
-                'If your Magento site has multiple views, ' .
-                'you can set the scope to apply to a specific view.'
+                'If your Magento installation has multiple websites, ' .
+                'you can edit the scope to use the product on specific sites.'
             ),
         ];
         $sortOrder = 0;

app/code/Magento/Customer/view/base/ui_component/customer_form.xml

@@ -104,7 +104,7 @@
                     </item>
                     <item name="tooltip" xsi:type="array">
                         <item name="link" xsi:type="string">http://docs.magento.com/m2/ce/user_guide/configuration/scope.html</item>
-                        <item name="description" xsi:type="string" translate="true">If your Magento site has multiple views, you can set the scope to apply to a specific view.</item>
+                        <item name="description" xsi:type="string" translate="true">If your Magento installation has multiple websites, you can edit the scope to associate the customer with a specific site.</item>
                     </item>
                 </item>
             </argument>

app/code/Magento/Ui/view/base/web/js/form/element/abstract.js

@@ -158,16 +158,20 @@ define([
          * @returns {Abstract} Chainable.
          */
         _setClasses: function () {
-            var additional = this.additionalClasses,
-                classes;
+            var additional = this.additionalClasses;
 
-            if (_.isString(additional) && additional.trim().length) {
-                additional = this.additionalClasses.trim().split(' ');
-                classes = this.additionalClasses = {};
+            if (_.isString(additional)){
+                this.additionalClasses = {};
 
-                additional.forEach(function (name) {
-                    classes[name] = true;
-                }, this);
+                if (additional.trim().length) {
+                    additional = additional.trim().split(' ');
+
+                    additional.forEach(function (name) {
+                        if (name.length) {
+                            this.additionalClasses[name] = true;
+                        }
+                    }, this);
+                }
             }
 
             _.extend(this.additionalClasses, {

dev/tests/functional/utils/generate.php

@@ -5,19 +5,24 @@
  */
 require_once dirname(__FILE__) . '/' . 'bootstrap.php';
 
-// Generate page
-$objectManager->create(\Magento\Mtf\Util\Generate\Page::class)->launch();
-
 // Generate fixtures
 $magentoObjectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER);
 $magentoObjectManager = $magentoObjectManagerFactory->create($_SERVER);
-$objectManager->create(\Magento\Mtf\Util\Generate\Fixture::class)->launch();
 
 // Generate repositories
 $magentoObjectManager->get(\Magento\Framework\App\State::class)->setAreaCode('frontend');
-$objectManager->create(\Magento\Mtf\Util\Generate\Repository::class)->launch();
 
 // Generate factories for old end-to-end tests
 $magentoObjectManager->create(\Magento\Mtf\Util\Generate\Factory::class)->launch();
 
+$generatorPool = $objectManager->get('Magento\Mtf\Util\Generate\Pool');
+foreach ($generatorPool->getGenerators() as $generator) {
+    if (!$generator instanceof \Magento\Mtf\Util\Generate\LauncherInterface) {
+        throw new \InvalidArgumentException(
+            'Generator ' . get_class($generator) . ' should implement LauncherInterface'
+        );
+    }
+    $generator->launch();
+}
+
 \Magento\Mtf\Util\Generate\GenerateResult::displayResults();

lib/internal/Magento/Framework/View/Result/Layout.php

@@ -16,6 +16,8 @@
  * A generic layout response can be used for rendering any kind of layout
  * So it comprises a response body from the layout elements it has and sets it to the HTTP response
  *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ *
  * @api
  */
 class Layout extends AbstractResult
@@ -160,10 +162,10 @@ public function renderResult(ResponseInterface $httpResponse)
     {
         \Magento\Framework\Profiler::start('LAYOUT');
         \Magento\Framework\Profiler::start('layout_render');
-        
+
         $this->eventManager->dispatch('layout_render_before');
         $this->eventManager->dispatch('layout_render_before_' . $this->request->getFullActionName());
-        
+
         $this->applyHttpHeaders($httpResponse);
         $this->render($httpResponse);
 

lib/web/mage/edit-trigger.js

@@ -98,12 +98,16 @@
          * @protected
          */
         _onMouseMove: function(e) {
-            var target = $(e.target);
-            target = target.is(this.trigger) || target.is(this.options.editSelector) ?
-                target :
-                target.parents(this.options.editSelector).first();
+            var target = $(e.target),
+                inner = target.find(this.options.editSelector);
 
-            if (target.size()) {
+            if ($(e.target).is('button') && inner.length) {
+                target = inner;
+            } else if (!target.is(this.trigger) && !target.is(this.options.editSelector)) {
+                target = target.parents(this.options.editSelector).first();
+            }
+
+            if (target.length) {
                 if (!target.is(this.trigger)) {
                     this._setPosition(target);
                     this.currentTarget = target;