magento2-login-as-customer/issues/90: Tests stabilization

Author: naydav

app/code/Magento/LoginAsCustomerLog/Model/GetLogList.php

@@ -61,7 +61,7 @@ public function __construct(
     /**
      * @inheritDoc
      */
-    public function execute(SearchCriteriaInterface $searchCriteria = null): LogSearchResultsInterface
+    public function execute(SearchCriteriaInterface $searchCriteria): LogSearchResultsInterface
     {
         $collection = $this->logCollectionFactory->create();
         $searchCriteria = $searchCriteria ?: $this->searchCriteriaBuilder->create();

app/code/Magento/LoginAsCustomerLog/Model/Log.php

@@ -16,7 +16,6 @@
  */
 class Log extends AbstractExtensibleModel implements LogInterface
 {
-
     /**
      * @inheritDoc
      */

app/code/Magento/LoginAsCustomerLog/etc/frontend/di.xml

@@ -7,6 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <type name="Magento\LoginAsCustomerApi\Api\AuthenticateCustomerInterface">
-        <plugin name="log_authentication_plugin" type="Magento\LoginAsCustomerLog\Plugin\LoginAsCustomerApi\Api\AuthenticateCustomerInterface\LogAuthenticationPlugin"/>
+        <plugin name="log_authentication_plugin"
+                type="Magento\LoginAsCustomerLog\Plugin\LoginAsCustomerApi\Api\AuthenticateCustomerInterface\LogAuthenticationPlugin"/>
     </type>
 </config>

app/code/Magento/LoginAsCustomerSales/Plugin/AuthenticateCustomerPlugin.php

@@ -71,6 +71,7 @@ public function beforeExecute(
             $quote = $this->checkoutSession->getQuote();
             /* Remove items from guest cart */
             $quote->removeAllItems();
+            $this->quoteRepository->save($quote);
         }
         return null;
     }

app/code/Magento/LoginAsCustomerUi/Block/Adminhtml/ConfirmationPopup.php

@@ -14,6 +14,8 @@
 
 /**
  * Admin blog post
+ *
+ * @api
  */
 class ConfirmationPopup extends Template
 {
@@ -39,7 +41,6 @@ class ConfirmationPopup extends Template
     private $json;
 
     /**
-     * ConfirmationPopup constructor.
      * @param Template\Context $context
      * @param StoreOptions $storeOptions
      * @param ConfigInterface $config
@@ -60,7 +61,7 @@ public function __construct(
     }
 
     /**
-     * @return string
+     * @inheritdoc
      */
     public function getJsLayout()
     {
@@ -70,7 +71,8 @@ public function getJsLayout()
         $layout['components']['lac-confirmation-popup']['title'] = $showStoreViewOptions
             ? __('Login as Customer: Select Store View')
             : __('You are about to Login as Customer');
-        $layout['components']['lac-confirmation-popup']['content'] = __('Actions taken while in "Login as Customer" will affect actual customer data.');
+        $layout['components']['lac-confirmation-popup']['content'] =
+            __('Actions taken while in "Login as Customer" will affect actual customer data.');
 
         $layout['components']['lac-confirmation-popup']['showStoreViewOptions'] = $showStoreViewOptions;
         $layout['components']['lac-confirmation-popup']['storeViewOptions'] = $showStoreViewOptions

app/code/Magento/LoginAsCustomerUi/composer.json

@@ -7,8 +7,7 @@
         "magento/module-login-as-customer-api": "*",
         "magento/module-backend": "*",
         "magento/module-customer": "*",
-        "magento/module-store": "*",
-        "magento/module-ui": "*"
+        "magento/module-store": "*"
     },
     "suggest": {
         "magento/module-login-as-customer": "*"

app/code/Magento/LoginAsCustomerUi/view/adminhtml/templates/confirmation-popup.phtml

@@ -9,7 +9,7 @@
 <script type="text/x-magento-init">
     {
         "*": {
-            "Magento_Ui/js/core/app": <?php /* @escapeNotVerified */ echo $block->getJsLayout();?>
+            "Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout();?>
         }
     }
  </script>

app/code/Magento/LoginAsCustomerUi/view/adminhtml/web/css/source/_module.less

@@ -3,15 +3,25 @@
  * See COPYING.txt for license details.
  */
 
+//
+//  Variables
+//  ---------------------------------------------
+
+@lac-confirm-background-color: #ccc;
+
+//
+//  Common
+//  ---------------------------------------------
+
 & when (@media-common = true) {
     .modal-popup.confirm.lac-confirm {
         .modal-inner-wrap {
             max-width: 55rem;
         }
         .modal-title {
-            border-bottom: 1px solid rgb(204, 204, 204);
-            width: 100%;
+            border-bottom: 1px solid @lac-confirm-background-color;
             padding-bottom: 15px;
+            width: 100%;
         }
 
         .store-view-ptions {

app/code/Magento/LoginAsCustomerUi/view/adminhtml/web/js/confirmation-popup.js

@@ -18,11 +18,14 @@ define(
     function (Component, confirm, $, ko, $t, template, selectTpl, undefined) {
 
         return Component.extend({
+            /**
+             * Initialize Component
+             */
             initialize: function () {
                 this._super();
-                var self = this;
+                var self = this,
+                    content = '<div class="message message-warning">' + self.content + '</div>';
 
-                var content = '<div class="message message-warning">' + self.content + '</div>';
                 if (self.showStoreViewOptions) {
                     content = template(
                         selectTpl,
@@ -35,6 +38,12 @@ define(
                         }) + content;
                 }
 
+                /**
+                 * Confirmation popup
+                 *
+                 * @param {String} url
+                 * @returns {Boolean}
+                 */
                 window.lacConfirmationPopup = function (url) {
                     confirm({
                         title: self.title,
@@ -46,6 +55,7 @@ define(
                              */
                             confirm: function () {
                                 var storeId = $('#lac-confirmation-popup-store-id').val();
+
                                 if (storeId) {
                                     url += ((url.indexOf('?') == -1) ? '?' : '&') + 'store_id=' + storeId;
                                 }