From d60e74cabec65864fd77a9aec189bf6aebe579d5 Mon Sep 17 00:00:00 2001
From: LavrovArtem <artjomlav@gmail.com>
Date: Thu, 31 Aug 2017 11:41:14 +0300
Subject: [PATCH] fix review's issues

---
 src/client/sandbox/xhr.js                | 32 +++++++++++-------------
 test/client/fixtures/sandbox/xhr-test.js | 17 +++++++------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/src/client/sandbox/xhr.js b/src/client/sandbox/xhr.js
index 236d399deb..1e82ed4ffe 100644
--- a/src/client/sandbox/xhr.js
+++ b/src/client/sandbox/xhr.js
@@ -81,7 +81,7 @@ export default class XhrSandbox extends SandboxBase {
             nativeMethods.xhrRemoveEventListener.call(this, 'readystatechange', syncCookieWithClient);
         };
 
-        const xhrConstrWrapper = function () {
+        const xmlHttpRequestWrapper = function () {
             const xhr = new nativeMethods.XMLHttpRequest();
 
             nativeMethods.xhrAddEventListener.call(xhr, 'readystatechange', emitXhrCompletedEvent);
@@ -90,13 +90,13 @@ export default class XhrSandbox extends SandboxBase {
             return xhr;
         };
 
-        window.XMLHttpRequest           = xhrConstrWrapper;
-        xhrConstrWrapper.prototype      = xmlHttpRequestProto;
-        xhrConstrWrapper.toString       = () => xhrConstructorString;
-        xmlHttpRequestProto.constructor = xhrConstrWrapper;
+        window.XMLHttpRequest           = xmlHttpRequestWrapper;
+        xmlHttpRequestWrapper.prototype = xmlHttpRequestProto;
+        xmlHttpRequestWrapper.toString  = () => xhrConstructorString;
+        xmlHttpRequestProto.constructor = xmlHttpRequestWrapper;
 
         const defineConstructorConst = (name, value) =>
-            nativeMethods.objectDefineProperty.call(window.Object, xhrConstrWrapper, name, { value, enumerable: true });
+            nativeMethods.objectDefineProperty.call(window.Object, xmlHttpRequestWrapper, name, { value, enumerable: true });
 
         defineConstructorConst('UNSENT', 0);
         defineConstructorConst('OPENED', 1);
@@ -129,28 +129,26 @@ export default class XhrSandbox extends SandboxBase {
         };
 
         xmlHttpRequestProto.send = function () {
-            const xhr = this;
-
-            xhrSandbox.emit(xhrSandbox.BEFORE_XHR_SEND_EVENT, { xhr });
+            xhrSandbox.emit(xhrSandbox.BEFORE_XHR_SEND_EVENT, { xhr: this });
 
             // NOTE: Add the XHR request mark, so that a proxy can recognize a request as a XHR request. As all
             // requests are passed to the proxy, we need to perform Same Origin Policy compliance checks on the
             // server side. So, we pass the CORS support flag to inform the proxy that it can analyze the
             // Access-Control_Allow_Origin flag and skip "preflight" requests.
-            nativeMethods.xhrSetRequestHeader.call(xhr, XHR_HEADERS.requestMarker, 'true');
-            nativeMethods.xhrSetRequestHeader.call(xhr, XHR_HEADERS.origin, getOriginHeader());
+            nativeMethods.xhrSetRequestHeader.call(this, XHR_HEADERS.requestMarker, 'true');
+            nativeMethods.xhrSetRequestHeader.call(this, XHR_HEADERS.origin, getOriginHeader());
 
             if (xhrSandbox.corsSupported)
-                nativeMethods.xhrSetRequestHeader.call(xhr, XHR_HEADERS.corsSupported, 'true');
+                nativeMethods.xhrSetRequestHeader.call(this, XHR_HEADERS.corsSupported, 'true');
 
-            if (xhr.withCredentials)
-                nativeMethods.xhrSetRequestHeader.call(xhr, XHR_HEADERS.withCredentials, 'true');
+            if (this.withCredentials)
+                nativeMethods.xhrSetRequestHeader.call(this, XHR_HEADERS.withCredentials, 'true');
 
-            nativeMethods.xhrSend.apply(xhr, arguments);
+            nativeMethods.xhrSend.apply(this, arguments);
 
             // NOTE: For xhr with the sync mode
-            emitXhrCompletedEvent.call(xhr);
-            syncCookieWithClient.call(xhr);
+            emitXhrCompletedEvent.call(this);
+            syncCookieWithClient.call(this);
         };
 
         xmlHttpRequestProto.getResponseHeader = function (name) {
diff --git a/test/client/fixtures/sandbox/xhr-test.js b/test/client/fixtures/sandbox/xhr-test.js
index e08ea96d75..67c655d446 100644
--- a/test/client/fixtures/sandbox/xhr-test.js
+++ b/test/client/fixtures/sandbox/xhr-test.js
@@ -89,7 +89,7 @@ test('constructor', function () {
 module('regression');
 
 asyncTest('unexpected text modifying during typing text in the search input on the http://www.google.co.uk (B238528)', function () {
-    var timeout            = 100;
+    var timeoutId          = 100;
     var syncActionExecuted = false;
     var xhr                = new XMLHttpRequest();
 
@@ -101,7 +101,7 @@ asyncTest('unexpected text modifying during typing text in the search input on t
     };
 
     xhr.onreadystatechange = ready;
-    xhr.open('GET', '/xhr-test/' + timeout);
+    xhr.open('GET', '/xhr-test/' + timeoutId);
     xhr.send(null);
 
     syncActionExecuted = true;
@@ -219,11 +219,11 @@ asyncTest('authorization headers by client should be processed (GH-1016)', funct
     xhr.send();
 });
 
-asyncTest('our internal the "readystatechange" handler must be first (GH-1283)', function () {
-    var xhr      = new XMLHttpRequest();
-    var timeout  = null;
-    var testDone = function (eventObj) {
-        clearTimeout(timeout);
+asyncTest('"XHR_COMPLETED_EVENT" for completed requests should be raised before calling outer handlers (GH-1283)', function () {
+    var xhr       = new XMLHttpRequest();
+    var timeoutId = null;
+    var testDone  = function (eventObj) {
+        clearTimeout(timeoutId);
         ok(!!eventObj);
         start();
     };
@@ -235,8 +235,9 @@ asyncTest('our internal the "readystatechange" handler must be first (GH-1283)',
 
     xhr.addEventListener('readystatechange', readyStateChangeHandler, true);
     xhr.onreadystatechange = readyStateChangeHandler;
+
     xhrSandbox.on(xhrSandbox.XHR_COMPLETED_EVENT, testDone);
-    timeout = setTimeout(testDone, 2000);
+    timeoutId = setTimeout(testDone, 2000);
 
     xhr.open('GET', '/xhr-test/', true);
     xhr.send();