Merge remote-tracking branch 'origin/MAGETWO-59135' into BUGS

Author: slavvka

app/code/Magento/Customer/view/frontend/templates/js/customer-data/invalidation-rules.phtml

@@ -18,7 +18,7 @@
                 'website-rule' => [
                     'Magento_Customer/js/invalidation-rules/website-rule' => [
                         'scopeConfig' => [
-                            'website_id' => $block->getWebsiteId(),
+                            'websiteId' => $block->getWebsiteId(),
                         ]
                     ]
                 ]

app/code/Magento/Customer/view/frontend/web/js/customer-data.js

@@ -214,6 +214,7 @@ define([
                     this.reload(storageInvalidation.keys(), false);
                 }
             }
+
             if (!_.isEmpty(privateContent)) {
                 countryData = this.get('directory-data');
 

app/code/Magento/Customer/view/frontend/web/js/invalidation-processor.js

@@ -3,14 +3,16 @@
  * See COPYING.txt for license details.
  */
 define([
-    "underscore",
-    "uiElement",
+    'underscore',
+    'uiElement',
     'Magento_Customer/js/customer-data'
 ], function (_, Element, customerData) {
-    "use strict";
-    var invalidationRules;
+    'use strict';
 
     return Element.extend({
+        /**
+         * Initialize object
+         */
         initialize: function () {
             this._super();
             this.process(customerData);
@@ -19,17 +21,18 @@ define([
         /**
          * Process all rules in loop, each rule can invalidate some sections in customer data
          *
-         * @param {Object} customerData
+         * @param {Object} customerDataObject
          */
-        process: function (customerData) {
+        process: function (customerDataObject) {
             _.each(this.invalidationRules, function (rule, ruleName) {
                 _.each(rule, function (ruleArgs, rulePath) {
                     require([rulePath], function (Rule) {
-                        var rule = new Rule(ruleArgs);
-                        if (!_.isFunction(rule.process)) {
-                            throw new Error("Rule " + ruleName + " should implement invalidationProcessor interface");
+                        var currentRule = new Rule(ruleArgs);
+
+                        if (!_.isFunction(currentRule.process)) {
+                            throw new Error('Rule ' + ruleName + ' should implement invalidationProcessor interface');
                         }
-                        rule.process(customerData);
+                        currentRule.process(customerDataObject);
                     });
                 });
             });

app/code/Magento/Customer/view/frontend/web/js/invalidation-rules/website-rule.js

@@ -3,7 +3,7 @@
  * See COPYING.txt for license details.
  */
 define([
-    "uiClass"
+    'uiClass'
 ], function (Element) {
     'use strict';
 
@@ -12,7 +12,7 @@ define([
         defaults: {
             scopeConfig: {}
         },
-        
+
         /**
          * Takes website id from current customer data and compare it with current website id
          * If customer belongs to another scope, we need to invalidate current section
@@ -22,7 +22,7 @@ define([
         process: function (customerData) {
             var customer = customerData.get('customer');
 
-            if (this.scopeConfig && customer() && customer().websiteId != this.scopeConfig.website_id) {
+            if (this.scopeConfig && customer() && customer().websiteId !== this.scopeConfig.websiteId) {
                 customerData.reload(['customer']);
             }
         }

dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/invalidation-processor.test.js

@@ -1,3 +1,4 @@
+/* eslint-disable max-nested-callbacks */
 define([
     'squire'
 ], function (Squire) {
@@ -17,6 +18,13 @@ define([
             processor = new Constr({
                 name: 'processor'
             });
+            processor.invalidationRules = {
+                'website-rule': {
+                    'Magento_Customer/js/invalidation-rules/website-rule': {
+                        process: jasmine.createSpy()
+                    }
+                }
+            };
             done();
         });
     });
@@ -25,15 +33,9 @@ define([
 
         describe('"process" method', function () {
             it('record status is 1', function () {
-                var requireTmp = require;
+                /* eslint-disable no-native-reassign */
 
-                processor.invalidationRules = {
-                    'website-rule': {
-                        'Magento_Customer/js/invalidation-rules/website-rule': {
-                            process: jasmine.createSpy()
-                        }
-                    }
-                };
+                var requireTmp = require;
 
                 require = jasmine.createSpy();
                 processor.process();