From 6de3e5742688e0a2656f2485b8c693245fc9cb00 Mon Sep 17 00:00:00 2001
From: Mikhail Losev <miherlosev@mail.ru>
Date: Fri, 8 Jul 2016 10:55:35 +0300
Subject: [PATCH] Force line endings (#664)

* force line endings

* Normalize all the line endings

* add eslint rule
---
 .eslintrc                                     |  185 +--
 .gitattributes                                |    8 +
 .../fixtures/sandbox/node/attributes-test.js  | 1154 ++++++++---------
 .../fixtures/sandbox/node/window-test.js      |  260 ++--
 test/client/fixtures/sandbox/storages-test.js |  836 ++++++------
 test/playground/upload-storage/.gitkeep       |    2 +-
 6 files changed, 1227 insertions(+), 1218 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.eslintrc b/.eslintrc
index 5ab0d2ff6..38bb92ed0 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,92 +1,93 @@
-{
-  "parser": "babel-eslint",
-  "extends": "eslint:recommended",
-  "rules": {
-    "no-alert": 2,
-    "no-array-constructor": 2,
-    "no-caller": 2,
-    "no-catch-shadow": 2,
-    "no-eval": 2,
-    "no-extend-native": 2,
-    "no-extra-bind": 2,
-    "no-implied-eval": 2,
-    "no-iterator": 2,
-    "no-label-var": 2,
-    "no-labels": 2,
-    "no-lone-blocks": 2,
-    "no-loop-func": 2,
-    "no-multi-str": 2,
-    "no-native-reassign": 2,
-    "no-new": 2,
-    "no-new-func": 2,
-    "no-new-object": 2,
-    "no-new-wrappers": 2,
-    "no-octal-escape": 2,
-    "no-process-exit": 2,
-    "no-proto": 2,
-    "no-return-assign": 2,
-    "no-script-url": 2,
-    "no-sequences": 2,
-    "no-shadow": 2,
-    "no-shadow-restricted-names": 2,
-    "no-spaced-func": 2,
-    "no-trailing-spaces": 2,
-    "no-undef-init": 2,
-    "no-unused-expressions": 2,
-    "no-with": 2,
-    "camelcase": 2,
-    "comma-spacing": 2,
-    "consistent-return": 2,
-    "eqeqeq": 2,
-    "semi": 2,
-    "semi-spacing": [2, {"before": false, "after": true}],
-    "space-infix-ops": 2,
-    "space-unary-ops": [2, { "words": true, "nonwords": false }],
-    "yoda": [2, "never"],
-    "brace-style": [2, "stroustrup", { "allowSingleLine": false }],
-    "eol-last": 2,
-    "indent": [2, 4, {"SwitchCase": 1}],
-    "key-spacing": [2, { "align": "value" }],
-    "max-nested-callbacks": [2, 3],
-    "new-parens": 2,
-    "newline-after-var": [2, "always"],
-    "no-lonely-if": 2,
-    "no-multiple-empty-lines":  [2, { "max": 2 }],
-    "no-nested-ternary": 2,
-    "no-underscore-dangle": 0,
-    "no-unneeded-ternary": 2,
-    "object-curly-spacing": [2, "always"],
-    "operator-assignment": [2, "always"],
-    "quotes": [2, "single", "avoid-escape"],
-    "keyword-spacing": 2,
-    "space-before-blocks": [2, "always"],
-    "prefer-const": 2,
-    "no-path-concat": 2,
-    "no-undefined": 2,
-    "strict": 0,
-    "curly": [2, "multi-or-nest"],
-    "dot-notation": 0,
-    "no-else-return": 2,
-    "one-var": [2, "never"],
-    "no-multi-spaces": [2, {
-      "exceptions": {
-        "VariableDeclarator": true,
-        "AssignmentExpression": true
-      }
-    }],
-    "radix": 2,
-    "no-extra-parens": 2,
-    "new-cap": [2, { "capIsNew": false }],
-    "space-before-function-paren": [2, "always"],
-    "no-use-before-define" : [2, "nofunc"],
-    "handle-callback-err": 0,
-    "import/export": 2
-  },
-  "env": {
-    "node": true,
-    "es6": true
-  },
-  "plugins": [
-    "import"
-  ]
-}
+{
+  "parser": "babel-eslint",
+  "extends": "eslint:recommended",
+  "rules": {
+    "no-alert": 2,
+    "no-array-constructor": 2,
+    "no-caller": 2,
+    "no-catch-shadow": 2,
+    "no-eval": 2,
+    "no-extend-native": 2,
+    "no-extra-bind": 2,
+    "no-implied-eval": 2,
+    "no-iterator": 2,
+    "no-label-var": 2,
+    "no-labels": 2,
+    "no-lone-blocks": 2,
+    "no-loop-func": 2,
+    "no-multi-str": 2,
+    "no-native-reassign": 2,
+    "no-new": 2,
+    "no-new-func": 2,
+    "no-new-object": 2,
+    "no-new-wrappers": 2,
+    "no-octal-escape": 2,
+    "no-process-exit": 2,
+    "no-proto": 2,
+    "no-return-assign": 2,
+    "no-script-url": 2,
+    "no-sequences": 2,
+    "no-shadow": 2,
+    "no-shadow-restricted-names": 2,
+    "no-spaced-func": 2,
+    "no-trailing-spaces": 2,
+    "no-undef-init": 2,
+    "no-unused-expressions": 2,
+    "no-with": 2,
+    "camelcase": 2,
+    "comma-spacing": 2,
+    "consistent-return": 2,
+    "eqeqeq": 2,
+    "semi": 2,
+    "semi-spacing": [2, {"before": false, "after": true}],
+    "space-infix-ops": 2,
+    "space-unary-ops": [2, { "words": true, "nonwords": false }],
+    "yoda": [2, "never"],
+    "brace-style": [2, "stroustrup", { "allowSingleLine": false }],
+    "eol-last": 2,
+    "indent": [2, 4, {"SwitchCase": 1}],
+    "key-spacing": [2, { "align": "value" }],
+    "max-nested-callbacks": [2, 3],
+    "new-parens": 2,
+    "newline-after-var": [2, "always"],
+    "no-lonely-if": 2,
+    "no-multiple-empty-lines":  [2, { "max": 2 }],
+    "no-nested-ternary": 2,
+    "no-underscore-dangle": 0,
+    "no-unneeded-ternary": 2,
+    "object-curly-spacing": [2, "always"],
+    "operator-assignment": [2, "always"],
+    "quotes": [2, "single", "avoid-escape"],
+    "keyword-spacing": 2,
+    "space-before-blocks": [2, "always"],
+    "prefer-const": 2,
+    "no-path-concat": 2,
+    "no-undefined": 2,
+    "strict": 0,
+    "curly": [2, "multi-or-nest"],
+    "dot-notation": 0,
+    "no-else-return": 2,
+    "one-var": [2, "never"],
+    "no-multi-spaces": [2, {
+      "exceptions": {
+        "VariableDeclarator": true,
+        "AssignmentExpression": true
+      }
+    }],
+    "radix": 2,
+    "no-extra-parens": 2,
+    "new-cap": [2, { "capIsNew": false }],
+    "space-before-function-paren": [2, "always"],
+    "no-use-before-define" : [2, "nofunc"],
+    "handle-callback-err": 0,
+    "linebreak-style": [2, "unix"],
+    "import/export": 2
+  },
+  "env": {
+    "node": true,
+    "es6": true
+  },
+  "plugins": [
+    "import"
+  ]
+}
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..ec5f4d2a2
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,8 @@
+* text=auto
+*.js text eol=lf
+*.css text eol=lf
+*.html text eol=lf
+*.md text eol=lf
+
+*.png binary
+*.ico binary
diff --git a/test/client/fixtures/sandbox/node/attributes-test.js b/test/client/fixtures/sandbox/node/attributes-test.js
index ea65451ae..4a088ca85 100644
--- a/test/client/fixtures/sandbox/node/attributes-test.js
+++ b/test/client/fixtures/sandbox/node/attributes-test.js
@@ -1,577 +1,577 @@
-var INTERNAL_PROPS   = hammerhead.get('../processing/dom/internal-properties');
-var domProcessor     = hammerhead.get('./dom-processor');
-var htmlUtils        = hammerhead.get('./utils/html');
-var settings         = hammerhead.get('./settings');
-var urlUtils         = hammerhead.get('./utils/url');
-var destLocation     = hammerhead.get('./utils/destination-location');
-var featureDetection = hammerhead.get('./utils/feature-detection');
-
-var nativeMethods = hammerhead.nativeMethods;
-var browserUtils  = hammerhead.utils.browser;
-var iframeSandbox = hammerhead.sandbox.iframe;
-var unloadSandbox = hammerhead.sandbox.event.unload;
-
-QUnit.testStart(function () {
-    // NOTE: The 'window.open' method used in QUnit.
-    window.open       = nativeMethods.windowOpen;
-    window.setTimeout = nativeMethods.setTimeout;
-    iframeSandbox.on(iframeSandbox.RUN_TASK_SCRIPT, initIframeTestHandler);
-    iframeSandbox.off(iframeSandbox.RUN_TASK_SCRIPT, iframeSandbox.iframeReadyToInitHandler);
-});
-
-QUnit.testDone(function () {
-    iframeSandbox.off(iframeSandbox.RUN_TASK_SCRIPT, initIframeTestHandler);
-});
-
-test('url', function () {
-    var testUrlAttr = function (tagName, attr) {
-        var el         = nativeMethods.createElement.call(document, tagName);
-        var storedAttr = domProcessor.getStoredAttrName(attr);
-        var namespace  = 'http://www.w3.org/1999/xhtml';
-
-        var getAttr = function () {
-            return nativeMethods.getAttribute.call(el, attr);
-        };
-
-        var getWrapAttr = function () {
-            return nativeMethods.getAttribute.call(el, storedAttr);
-        };
-
-        processDomMeth(el);
-
-        el.setAttribute(attr, '');
-
-        var emptyAttrValue = el[attr];
-        var dest           = 'http://dest.com/';
-        var resourceType   = null;
-
-        if (tagName === 'script')
-            resourceType = 's';
-        else if (tagName === 'form')
-            resourceType = 'f';
-
-        var proxy = urlUtils.getProxyUrl(dest, null, null, null, resourceType);
-
-        setProperty(el, attr, dest);
-        strictEqual(el[attr], proxy);
-        strictEqual(getProperty(el, attr), dest);
-        strictEqual(getAttr(), proxy);
-        strictEqual(getWrapAttr(), dest);
-
-        var newUrl      = '/image';
-        var proxyNewUrl = urlUtils.getProxyUrl('/image', null, null, null, resourceType);
-
-        el.setAttribute(attr, newUrl);
-        strictEqual(el[attr], proxyNewUrl);
-        strictEqual(getProperty(el, attr), urlUtils.parseProxyUrl(proxyNewUrl).destUrl);
-        strictEqual(getAttr(), proxyNewUrl);
-        strictEqual(getWrapAttr(), newUrl);
-
-        setProperty(el, attr, '');
-        strictEqual(getWrapAttr(), '');
-        strictEqual(getAttr(), '');
-        strictEqual(el[attr], emptyAttrValue);
-        strictEqual(getProperty(el, attr), destLocation.get());
-
-        el.removeAttribute(attr);
-        strictEqual(getWrapAttr(), null);
-        strictEqual(getAttr(), null);
-
-        if (attr === 'action' && featureDetection.emptyActionAttrFallbacksToTheLocation)
-            strictEqual(getProperty(el, attr), destLocation.get());
-        else
-            strictEqual(getProperty(el, attr), '');
-
-        el.setAttributeNS(namespace, attr, dest);
-        strictEqual(nativeMethods.getAttributeNS.call(el, namespace, attr), proxy);
-        strictEqual(nativeMethods.getAttributeNS.call(el, namespace, storedAttr), dest);
-    };
-
-    var testData = [
-        { tagName: 'a', attr: 'href' },
-        { tagName: 'script', attr: 'src' },
-        { tagName: 'link', attr: 'href' },
-        { tagName: 'form', attr: 'action' },
-        { tagName: 'embed', attr: 'src' },
-        { tagName: 'object', attr: 'data' }
-    ];
-
-    for (var i = 0; i < testData.length; i++)
-        testUrlAttr(testData[i].tagName, testData[i].attr);
-});
-
-test('script src', function () {
-    var storedSessionId = settings.get().sessionId;
-
-    settings.get().sessionId = 'sessionId';
-
-    var script = document.createElement('script');
-
-    processDomMeth(script);
-
-    document[INTERNAL_PROPS.documentCharset] = 'utf-8';
-
-    script.setAttribute('src', 'http://google.com');
-
-    strictEqual(urlUtils.parseProxyUrl(script.src).resourceType, 's');
-    strictEqual(urlUtils.parseProxyUrl(script.src).charset, 'utf-8');
-
-    document[INTERNAL_PROPS.documentCharset] = null;
-
-    settings.get().sessionId = storedSessionId;
-});
-
-asyncTest('iframe with "javascript: <html>...</html>" src', function () {
-    var iframe = document.createElement('iframe');
-    var src    = 'javascript:"<script>var d = {}; d.src = 1; window.test = true;<\/script>"';
-
-    iframe.id = 'test55';
-    processDomMeth(iframe);
-
-    iframe.setAttribute('src', src);
-
-    iframe.onload = function () {
-        if (this.contentWindow.test) {
-            ok(this.contentWindow.test);
-            document.body.removeChild(this);
-
-            start();
-        }
-    };
-
-    document.body.appendChild(iframe);
-});
-
-asyncTest('iframe html src', function () {
-    var iframe = document.createElement('iframe');
-    var src    = 'javascript:\'<html><body><a id=\\\'test\\\' data-attr=\"123\">link</a></body></html>\'';
-
-    iframe.id = 'test56';
-    processDomMeth(iframe);
-
-    iframe.setAttribute('src', src);
-
-    var srcAttr       = nativeMethods.getAttribute.call(iframe, 'src');
-    var storedSrcAttr = nativeMethods.getAttribute.call(iframe, domProcessor.getStoredAttrName('src'));
-
-    notEqual(srcAttr, src);
-    strictEqual(srcAttr, 'javascript:\'' +
-                         htmlUtils.processHtml('<html><body><a id=\'test\' data-attr=\"123\">link</a></body></html>') +
-                         '\'');
-    strictEqual(storedSrcAttr, src);
-    strictEqual(iframe.getAttribute('src'), src);
-
-    iframe.onload = function () {
-        if (this.contentDocument.getElementById('test')) {
-            ok(this.contentDocument.getElementById('test'));
-            strictEqual(this.contentDocument.getElementById('test').getAttribute('data-attr'), '123');
-            document.body.removeChild(this);
-
-            start();
-        }
-    };
-
-    document.body.appendChild(iframe);
-});
-
-test('iframe javascript src', function () {
-    var testData = [
-        {
-            src: "<img src=\\'http://google.com\\'/>" +
-                 "<div attr1=\"\\'\\'\" attr2=\\'\"\"\\'></div>",
-
-            expected: ["<div attr1=\"\\'\\'\" attr2=\"&quot;&quot;\"></div>",
-                "<div attr2=\\'\"\"\\' attr1=\"\\'\\'\"></div>"
-            ],
-
-            quote: '\''
-        },
-        {
-            src: "<img src='http://google.com'/>" +
-                 "<div attr1=\\\"''\\\" attr2='\\\"\\\"'></div>",
-
-            expected: ["<div attr1=\\\"''\\\" attr2=\\\"&quot;&quot;\\\"></div>",
-                "<div attr2='\\\"\\\"' attr1=\\\"''\\\"></div>"
-            ],
-
-            quote: '"'
-        },
-        {
-            src: "<script> t[i] = \\'\\\\'\\\\'\\'; j = \"\\\"\\\"\"; <\/script>",
-
-            expected: ["__set$(t,i,\\'\\\\'\\\\'\\');j=\"\\\"\\\"\""],
-
-            quote: '\''
-        },
-        {
-            src: "<script> t[i] = \'\\\'\\\'\'; j = \\\"\\\\\"\\\\\"\\\"; <\/script>",
-
-            expected: ["__set$(t,i,'\\\'\\\'');j=\\\"\\\\\"\\\\\"\\\";"],
-
-            quote: '"'
-        }
-    ];
-
-    var testContainer = document.createElement('iframe');
-
-    for (var i = 0; i < testData.length; i++) {
-        var src = testData[i].src;
-
-        src = 'javascript:' + testData[i].quote + src + testData[i].quote;
-
-        testContainer.setAttribute('src', src);
-
-        var processedSrc = testContainer.src;
-
-        // NOTE: Safari returns an encoded value for iframe.src with a javascript protocol value.
-        if (browserUtils.isSafari) {
-            processedSrc = processedSrc.replace(/%hammerhead%/g, '%25hammerhead%25');
-            processedSrc = decodeURI(processedSrc);
-        }
-
-        strictEqual(processedSrc.indexOf('javascript:' + testData[i].quote), 0);
-        strictEqual(processedSrc[processedSrc.length - 1], testData[i].quote);
-
-        processedSrc = processedSrc.replace(/%hammerhead%/g, '%25hammerhead%25');
-
-        var decodedSrc = decodeURIComponent(processedSrc);
-        var expected   = testData[i].expected;
-
-        ok(decodedSrc.indexOf(expected[0]) !== -1 || decodedSrc.indexOf(expected[1]) !== -1);
-    }
-});
-
-test('target', function () {
-    var tagNames = ['a', 'form', 'area', 'base'];
-    var tag      = null;
-
-    for (var i = 0; i < tagNames.length; i++) {
-        tag = document.createElement(tagNames[i]);
-
-        tag.setAttribute('target', '_blank');
-        ok(!tag.getAttribute('target'));
-
-        tag.setAttribute('target', '_self');
-        ok(tag.getAttribute('target'));
-
-        setProperty(tag, 'target', '_blank');
-        ok(tag.target !== '_blank');
-    }
-});
-
-test('onclick', function () {
-    var link      = document.createElement('a');
-    var attrValue = 'location.href="managers.aspx";';
-
-    link.setAttribute('onclick', attrValue);
-
-    var attr       = nativeMethods.getAttribute.call(link, 'onclick');
-    var storedAttr = nativeMethods.getAttribute.call(link, domProcessor.getStoredAttrName('onclick'));
-
-    notEqual(attr, storedAttr);
-    strictEqual(storedAttr, attrValue);
-    strictEqual(attr, processScript(attrValue));
-    strictEqual(link.getAttribute('onclick'), attrValue);
-});
-
-test('event - javascript protocol', function () {
-    var link      = document.createElement('a');
-    var attrValue = 'javascript:location.href="managers.aspx";';
-
-    link.setAttribute('onclick', attrValue);
-
-    var attr       = nativeMethods.getAttribute.call(link, 'onclick');
-    var storedAttr = nativeMethods.getAttribute.call(link, domProcessor.getStoredAttrName('onclick'));
-
-    notEqual(attr, storedAttr);
-    strictEqual(storedAttr, attrValue);
-    strictEqual(attr, 'javascript:' + processScript(attrValue.replace('javascript:', '')));
-    strictEqual(link.getAttribute('onclick'), attrValue);
-});
-
-test('url - javascript: protocol', function () {
-    var link      = document.createElement('a');
-    var hrefValue = 'javascript:location.href="managers.aspx?Delete=814";';
-
-    link.setAttribute('href', hrefValue);
-
-    var href       = nativeMethods.getAttribute.call(link, 'href');
-    var storedHref = nativeMethods.getAttribute.call(link, domProcessor.getStoredAttrName('href'));
-
-    notEqual(href, storedHref);
-    strictEqual(storedHref, hrefValue);
-    strictEqual(href, 'javascript:' + processScript(hrefValue.replace('javascript:', '')));
-    strictEqual(link.getAttribute('href'), hrefValue);
-});
-
-test('iframe', function () {
-    var attr       = 'sandbox';
-    var storedAttr = domProcessor.getStoredAttrName(attr);
-    var iframe     = document.createElement('iframe');
-
-    ok(!nativeMethods.getAttribute.call(iframe, attr));
-    ok(!nativeMethods.getAttribute.call(iframe, storedAttr));
-    ok(!iframe.getAttribute(attr));
-
-    iframe.setAttribute(attr, 'allow-scripts');
-    strictEqual(nativeMethods.getAttribute.call(iframe, attr), 'allow-scripts allow-same-origin');
-    strictEqual(nativeMethods.getAttribute.call(iframe, storedAttr), 'allow-scripts');
-    strictEqual(iframe.getAttribute(attr), 'allow-scripts');
-
-    iframe.setAttribute(attr, 'allow-same-origin');
-    strictEqual(nativeMethods.getAttribute.call(iframe, attr), 'allow-same-origin allow-scripts');
-    strictEqual(nativeMethods.getAttribute.call(iframe, storedAttr), 'allow-same-origin');
-    strictEqual(iframe.getAttribute(attr), 'allow-same-origin');
-
-    iframe.setAttribute(attr, 'allow-scripts allow-same-origin');
-    strictEqual(nativeMethods.getAttribute.call(iframe, attr), 'allow-scripts allow-same-origin');
-    strictEqual(nativeMethods.getAttribute.call(iframe, storedAttr), 'allow-scripts allow-same-origin');
-    strictEqual(iframe.getAttribute(attr), 'allow-scripts allow-same-origin');
-
-    iframe.setAttribute(attr, 'allow-same-origin allow-forms');
-    strictEqual(nativeMethods.getAttribute.call(iframe, attr), 'allow-same-origin allow-forms allow-scripts');
-    strictEqual(nativeMethods.getAttribute.call(iframe, storedAttr), 'allow-same-origin allow-forms');
-    strictEqual(iframe.getAttribute(attr), 'allow-same-origin allow-forms');
-
-    iframe.setAttribute(attr, 'allow-scripts allow-forms');
-    strictEqual(nativeMethods.getAttribute.call(iframe, attr), 'allow-scripts allow-forms allow-same-origin');
-    strictEqual(nativeMethods.getAttribute.call(iframe, storedAttr), 'allow-scripts allow-forms');
-    strictEqual(iframe.getAttribute(attr), 'allow-scripts allow-forms');
-
-    iframe.setAttribute(attr, 'allow-scripts allow-forms allow-same-origin');
-    strictEqual(nativeMethods.getAttribute.call(iframe, attr), 'allow-scripts allow-forms allow-same-origin');
-    strictEqual(nativeMethods.getAttribute.call(iframe, storedAttr), 'allow-scripts allow-forms allow-same-origin');
-    strictEqual(iframe.getAttribute(attr), 'allow-scripts allow-forms allow-same-origin');
-
-    iframe.setAttribute(attr, 'allow-forms');
-    strictEqual(nativeMethods.getAttribute.call(iframe, attr), 'allow-forms allow-same-origin allow-scripts');
-    strictEqual(nativeMethods.getAttribute.call(iframe, storedAttr), 'allow-forms');
-    strictEqual(iframe.getAttribute(attr), 'allow-forms');
-});
-
-test('crossdomain iframe', function () {
-    var iframe        = document.createElement('iframe');
-    var storedSrcAttr = domProcessor.getStoredAttrName('src');
-
-    var savedGetProxyUrl                  = urlUtils.getProxyUrl;
-    var savedGetCrossDomainIframeProxyUrl = urlUtils.getCrossDomainIframeProxyUrl;
-
-    var crossDomainUrl      = 'http://cross.domain.com/';
-    var crossDomainProxyUrl = 'http://proxy.cross.domain.com/';
-    var proxyUrl            = 'http://proxy.com/';
-
-
-    urlUtils.getProxyUrl = function () {
-        return proxyUrl;
-    };
-
-    urlUtils.getCrossDomainIframeProxyUrl = function () {
-        return crossDomainProxyUrl;
-    };
-
-    setProperty(iframe, 'src', crossDomainUrl);
-    strictEqual(iframe.src, crossDomainProxyUrl);
-    strictEqual(nativeMethods.getAttribute.call(iframe, 'src'), crossDomainProxyUrl);
-    strictEqual(nativeMethods.getAttribute.call(iframe, storedSrcAttr), crossDomainUrl);
-
-    setProperty(iframe, 'src', location.toString() + '?param');
-    strictEqual(iframe.src, proxyUrl);
-    strictEqual(nativeMethods.getAttribute.call(iframe, 'src'), proxyUrl);
-    strictEqual(iframe.getAttribute('src'), location.toString() + '?param');
-
-    urlUtils.getProxyUrl                  = savedGetProxyUrl;
-    urlUtils.getCrossDomainIframeProxyUrl = savedGetCrossDomainIframeProxyUrl;
-});
-
-test('input.autocomplete', function () {
-    var input      = document.createElement('input');
-    var etalon     = nativeMethods.createElement.call(document, 'input');
-    var storedAttr = domProcessor.getStoredAttrName('autocomplete');
-
-    strictEqual(input.getAttribute('autocomplete'), nativeMethods.getAttribute.call(etalon, 'autocomplete'));
-    strictEqual(nativeMethods.getAttribute.call(input, 'autocomplete'), 'off');
-    strictEqual(nativeMethods.getAttribute.call(input, storedAttr), 'none');
-
-    input.setAttribute('autocomplete', 'off');
-    nativeMethods.setAttribute.call(etalon, 'autocomplete', 'off');
-    strictEqual(input.getAttribute('autocomplete'), nativeMethods.getAttribute.call(etalon, 'autocomplete'));
-    strictEqual(nativeMethods.getAttribute.call(input, 'autocomplete'), 'off');
-    strictEqual(nativeMethods.getAttribute.call(input, storedAttr), 'off');
-
-    input.setAttribute('autocomplete', 'on');
-    nativeMethods.setAttribute.call(etalon, 'autocomplete', 'on');
-    strictEqual(input.getAttribute('autocomplete'), nativeMethods.getAttribute.call(etalon, 'autocomplete'));
-    strictEqual(nativeMethods.getAttribute.call(input, 'autocomplete'), 'off');
-    strictEqual(nativeMethods.getAttribute.call(input, storedAttr), 'on');
-
-    input.setAttribute('autocomplete', '');
-    nativeMethods.setAttribute.call(etalon, 'autocomplete', '');
-    strictEqual(input.getAttribute('autocomplete'), nativeMethods.getAttribute.call(etalon, 'autocomplete'));
-    strictEqual(nativeMethods.getAttribute.call(input, 'autocomplete'), 'off');
-    strictEqual(nativeMethods.getAttribute.call(input, storedAttr), '');
-
-    input.removeAttribute('autocomplete');
-    nativeMethods.removeAttribute.call(etalon, 'autocomplete');
-    strictEqual(input.getAttribute('autocomplete'), nativeMethods.getAttribute.call(etalon, 'autocomplete'));
-    strictEqual(nativeMethods.getAttribute.call(input, 'autocomplete'), 'off');
-    strictEqual(nativeMethods.getAttribute.call(input, storedAttr), 'none');
-});
-
-test('window.onbeforeunload', function () {
-    var evName = 'on' + unloadSandbox.beforeUnloadEventName;
-
-    strictEqual(window[evName], null);
-    // NOTE: If this test fails, a system dialog blocks the page before it is unloaded.
-    setProperty(window, evName, function () {
-        return 'value';
-    });
-    ok(window[evName]);
-});
-
-test('element.innerHTML', function () {
-    settings.get().sessionId = 'sessionId';
-
-    var $container   = $('<div>');
-    var checkElement = function (el, attr, resourceType) {
-        var storedAttr     = domProcessor.getStoredAttrName(attr);
-        var exprectedValue = 'http://' + location.host + '/sessionId' + resourceType +
-                             '/https://example.com/Images/1.png';
-
-        strictEqual(nativeMethods.getAttribute.call(el, storedAttr), '/Images/1.png', 'destination url stored');
-        strictEqual(nativeMethods.getAttribute.call(el, attr), exprectedValue);
-    };
-
-    var html = ' <A iD = " fakeId1 " hRef = "/Images/1.png" attr="test" ></A>' +
-               ' <form iD="fakeId3 " action="/Images/1.png"    attr="test" ></form>' +
-               ' <link  iD = " fakeId5" href="/Images/1.png" attr="test" ></link>' +
-               ' <' + 'script  iD = "  fakeId6  " sRc=  "/Images/1.png" attr= "test"' + '>' + '</' + 'scriPt' + '>';
-
-    setProperty($container[0], 'innerHTML', html);
-
-    checkElement($container.find('a')[0], 'href', '');
-    checkElement($container.find('form')[0], 'action', '!f');
-    checkElement($container.find('link')[0], 'href', '');
-    checkElement($container.find('script')[0], 'src', '!s');
-});
-
-test('anchor with target attribute', function () {
-    var anchor   = document.createElement('a');
-    var url      = 'http://url.com/';
-    var iframe   = document.createElement('iframe');
-    var proxyUrl = urlUtils.getProxyUrl(url, null, null, null, 'i');
-
-    iframe.id   = 'test_unique_id_e16w9jnv5';
-    iframe.name = 'iframeName';
-    document.body.appendChild(iframe);
-
-    anchor.setAttribute('target', 'iframeName');
-
-    strictEqual(nativeMethods.getAttribute.call(anchor, 'target'), 'iframeName');
-
-    anchor.setAttribute('href', url);
-
-    var nativeHref = nativeMethods.getAttribute.call(anchor, 'href');
-
-    strictEqual(nativeHref, proxyUrl);
-    strictEqual(nativeMethods.getAttribute.call(anchor, domProcessor.getStoredAttrName('href')), url);
-    strictEqual(anchor.getAttribute('href'), url);
-    strictEqual(urlUtils.parseProxyUrl(nativeHref).resourceType, 'i');
-
-    iframe.parentNode.removeChild(iframe);
-});
-
-test('case insensitive target="_blank"', function () {
-    var link = document.createElement('a');
-
-    link.setAttribute('target', '_Blank');
-    ok(!link.getAttribute('target'));
-});
-
-module('regression');
-
-test('change href after target attribute changed (GH-534)', function () {
-    var iframe = document.createElement('iframe');
-    var check  = function (setTarget, clearTarget) {
-        var form = document.createElement('form');
-        var link = document.createElement('a');
-        var base = document.createElement('base');
-        var area = document.createElement('area');
-        var url  = 'http://some.domain.com/index.html';
-
-        form.setAttribute('action', url);
-        link.setAttribute('href', url);
-        base.setAttribute('href', url);
-        area.setAttribute('href', url);
-
-        strictEqual(urlUtils.parseProxyUrl(form.action).resourceType, 'f');
-        strictEqual(urlUtils.parseProxyUrl(link.href).resourceType, null);
-        strictEqual(urlUtils.parseProxyUrl(base.href).resourceType, null);
-        strictEqual(urlUtils.parseProxyUrl(area.href).resourceType, null);
-
-        setTarget(form);
-        setTarget(link);
-        setTarget(base);
-        setTarget(area);
-
-        strictEqual(urlUtils.parseProxyUrl(form.action).resourceType, 'if');
-        strictEqual(urlUtils.parseProxyUrl(link.href).resourceType, 'i');
-        strictEqual(urlUtils.parseProxyUrl(base.href).resourceType, 'i');
-        strictEqual(urlUtils.parseProxyUrl(area.href).resourceType, 'i');
-
-        clearTarget(form);
-        clearTarget(link);
-        clearTarget(base);
-        clearTarget(area);
-
-        strictEqual(urlUtils.parseProxyUrl(form.action).resourceType, 'f');
-        strictEqual(urlUtils.parseProxyUrl(link.href).resourceType, null);
-        strictEqual(urlUtils.parseProxyUrl(base.href).resourceType, null);
-        strictEqual(urlUtils.parseProxyUrl(area.href).resourceType, null);
-    };
-
-    iframe.id   = 'test_unique_id_ispt7enuo';
-    iframe.name = 'test-window';
-    document.body.appendChild(iframe);
-
-    check(function (el) {
-        el.setAttribute('target', 'test-window');
-    }, function (el) {
-        el.removeAttribute('target');
-    });
-
-    check(function (el) {
-        el.setAttribute('target', 'test-window');
-    }, function (el) {
-        el.setAttribute('target', '');
-    });
-
-    check(function (el) {
-        setProperty(el, 'target', 'test-window');
-    }, function (el) {
-        setProperty(el, 'target', '');
-    });
-
-    check(function (el) {
-        el.setAttribute('target', 'test-window');
-    }, function (el) {
-        el.setAttribute('target', '_Self');
-    });
-
-    iframe.parentNode.removeChild(iframe);
-});
-
-test('setting function to the link.href attribute value (T230764)', function () {
-    var a     = document.createElement('a');
-    var error = false;
-
-    try {
-        a.setAttribute('href', function () { /* */
-        });
-    }
-    catch (e) {
-        error = true;
-    }
-    finally {
-        ok(!error);
-    }
-});
+var INTERNAL_PROPS   = hammerhead.get('../processing/dom/internal-properties');
+var domProcessor     = hammerhead.get('./dom-processor');
+var htmlUtils        = hammerhead.get('./utils/html');
+var settings         = hammerhead.get('./settings');
+var urlUtils         = hammerhead.get('./utils/url');
+var destLocation     = hammerhead.get('./utils/destination-location');
+var featureDetection = hammerhead.get('./utils/feature-detection');
+
+var nativeMethods = hammerhead.nativeMethods;
+var browserUtils  = hammerhead.utils.browser;
+var iframeSandbox = hammerhead.sandbox.iframe;
+var unloadSandbox = hammerhead.sandbox.event.unload;
+
+QUnit.testStart(function () {
+    // NOTE: The 'window.open' method used in QUnit.
+    window.open       = nativeMethods.windowOpen;
+    window.setTimeout = nativeMethods.setTimeout;
+    iframeSandbox.on(iframeSandbox.RUN_TASK_SCRIPT, initIframeTestHandler);
+    iframeSandbox.off(iframeSandbox.RUN_TASK_SCRIPT, iframeSandbox.iframeReadyToInitHandler);
+});
+
+QUnit.testDone(function () {
+    iframeSandbox.off(iframeSandbox.RUN_TASK_SCRIPT, initIframeTestHandler);
+});
+
+test('url', function () {
+    var testUrlAttr = function (tagName, attr) {
+        var el         = nativeMethods.createElement.call(document, tagName);
+        var storedAttr = domProcessor.getStoredAttrName(attr);
+        var namespace  = 'http://www.w3.org/1999/xhtml';
+
+        var getAttr = function () {
+            return nativeMethods.getAttribute.call(el, attr);
+        };
+
+        var getWrapAttr = function () {
+            return nativeMethods.getAttribute.call(el, storedAttr);
+        };
+
+        processDomMeth(el);
+
+        el.setAttribute(attr, '');
+
+        var emptyAttrValue = el[attr];
+        var dest           = 'http://dest.com/';
+        var resourceType   = null;
+
+        if (tagName === 'script')
+            resourceType = 's';
+        else if (tagName === 'form')
+            resourceType = 'f';
+
+        var proxy = urlUtils.getProxyUrl(dest, null, null, null, resourceType);
+
+        setProperty(el, attr, dest);
+        strictEqual(el[attr], proxy);
+        strictEqual(getProperty(el, attr), dest);
+        strictEqual(getAttr(), proxy);
+        strictEqual(getWrapAttr(), dest);
+
+        var newUrl      = '/image';
+        var proxyNewUrl = urlUtils.getProxyUrl('/image', null, null, null, resourceType);
+
+        el.setAttribute(attr, newUrl);
+        strictEqual(el[attr], proxyNewUrl);
+        strictEqual(getProperty(el, attr), urlUtils.parseProxyUrl(proxyNewUrl).destUrl);
+        strictEqual(getAttr(), proxyNewUrl);
+        strictEqual(getWrapAttr(), newUrl);
+
+        setProperty(el, attr, '');
+        strictEqual(getWrapAttr(), '');
+        strictEqual(getAttr(), '');
+        strictEqual(el[attr], emptyAttrValue);
+        strictEqual(getProperty(el, attr), destLocation.get());
+
+        el.removeAttribute(attr);
+        strictEqual(getWrapAttr(), null);
+        strictEqual(getAttr(), null);
+
+        if (attr === 'action' && featureDetection.emptyActionAttrFallbacksToTheLocation)
+            strictEqual(getProperty(el, attr), destLocation.get());
+        else
+            strictEqual(getProperty(el, attr), '');
+
+        el.setAttributeNS(namespace, attr, dest);
+        strictEqual(nativeMethods.getAttributeNS.call(el, namespace, attr), proxy);
+        strictEqual(nativeMethods.getAttributeNS.call(el, namespace, storedAttr), dest);
+    };
+
+    var testData = [
+        { tagName: 'a', attr: 'href' },
+        { tagName: 'script', attr: 'src' },
+        { tagName: 'link', attr: 'href' },
+        { tagName: 'form', attr: 'action' },
+        { tagName: 'embed', attr: 'src' },
+        { tagName: 'object', attr: 'data' }
+    ];
+
+    for (var i = 0; i < testData.length; i++)
+        testUrlAttr(testData[i].tagName, testData[i].attr);
+});
+
+test('script src', function () {
+    var storedSessionId = settings.get().sessionId;
+
+    settings.get().sessionId = 'sessionId';
+
+    var script = document.createElement('script');
+
+    processDomMeth(script);
+
+    document[INTERNAL_PROPS.documentCharset] = 'utf-8';
+
+    script.setAttribute('src', 'http://google.com');
+
+    strictEqual(urlUtils.parseProxyUrl(script.src).resourceType, 's');
+    strictEqual(urlUtils.parseProxyUrl(script.src).charset, 'utf-8');
+
+    document[INTERNAL_PROPS.documentCharset] = null;
+
+    settings.get().sessionId = storedSessionId;
+});
+
+asyncTest('iframe with "javascript: <html>...</html>" src', function () {
+    var iframe = document.createElement('iframe');
+    var src    = 'javascript:"<script>var d = {}; d.src = 1; window.test = true;<\/script>"';
+
+    iframe.id = 'test55';
+    processDomMeth(iframe);
+
+    iframe.setAttribute('src', src);
+
+    iframe.onload = function () {
+        if (this.contentWindow.test) {
+            ok(this.contentWindow.test);
+            document.body.removeChild(this);
+
+            start();
+        }
+    };
+
+    document.body.appendChild(iframe);
+});
+
+asyncTest('iframe html src', function () {
+    var iframe = document.createElement('iframe');
+    var src    = 'javascript:\'<html><body><a id=\\\'test\\\' data-attr=\"123\">link</a></body></html>\'';
+
+    iframe.id = 'test56';
+    processDomMeth(iframe);
+
+    iframe.setAttribute('src', src);
+
+    var srcAttr       = nativeMethods.getAttribute.call(iframe, 'src');
+    var storedSrcAttr = nativeMethods.getAttribute.call(iframe, domProcessor.getStoredAttrName('src'));
+
+    notEqual(srcAttr, src);
+    strictEqual(srcAttr, 'javascript:\'' +
+                         htmlUtils.processHtml('<html><body><a id=\'test\' data-attr=\"123\">link</a></body></html>') +
+                         '\'');
+    strictEqual(storedSrcAttr, src);
+    strictEqual(iframe.getAttribute('src'), src);
+
+    iframe.onload = function () {
+        if (this.contentDocument.getElementById('test')) {
+            ok(this.contentDocument.getElementById('test'));
+            strictEqual(this.contentDocument.getElementById('test').getAttribute('data-attr'), '123');
+            document.body.removeChild(this);
+
+            start();
+        }
+    };
+
+    document.body.appendChild(iframe);
+});
+
+test('iframe javascript src', function () {
+    var testData = [
+        {
+            src: "<img src=\\'http://google.com\\'/>" +
+                 "<div attr1=\"\\'\\'\" attr2=\\'\"\"\\'></div>",
+
+            expected: ["<div attr1=\"\\'\\'\" attr2=\"&quot;&quot;\"></div>",
+                "<div attr2=\\'\"\"\\' attr1=\"\\'\\'\"></div>"
+            ],
+
+            quote: '\''
+        },
+        {
+            src: "<img src='http://google.com'/>" +
+                 "<div attr1=\\\"''\\\" attr2='\\\"\\\"'></div>",
+
+            expected: ["<div attr1=\\\"''\\\" attr2=\\\"&quot;&quot;\\\"></div>",
+                "<div attr2='\\\"\\\"' attr1=\\\"''\\\"></div>"
+            ],
+
+            quote: '"'
+        },
+        {
+            src: "<script> t[i] = \\'\\\\'\\\\'\\'; j = \"\\\"\\\"\"; <\/script>",
+
+            expected: ["__set$(t,i,\\'\\\\'\\\\'\\');j=\"\\\"\\\"\""],
+
+            quote: '\''
+        },
+        {
+            src: "<script> t[i] = \'\\\'\\\'\'; j = \\\"\\\\\"\\\\\"\\\"; <\/script>",
+
+            expected: ["__set$(t,i,'\\\'\\\'');j=\\\"\\\\\"\\\\\"\\\";"],
+
+            quote: '"'
+        }
+    ];
+
+    var testContainer = document.createElement('iframe');
+
+    for (var i = 0; i < testData.length; i++) {
+        var src = testData[i].src;
+
+        src = 'javascript:' + testData[i].quote + src + testData[i].quote;
+
+        testContainer.setAttribute('src', src);
+
+        var processedSrc = testContainer.src;
+
+        // NOTE: Safari returns an encoded value for iframe.src with a javascript protocol value.
+        if (browserUtils.isSafari) {
+            processedSrc = processedSrc.replace(/%hammerhead%/g, '%25hammerhead%25');
+            processedSrc = decodeURI(processedSrc);
+        }
+
+        strictEqual(processedSrc.indexOf('javascript:' + testData[i].quote), 0);
+        strictEqual(processedSrc[processedSrc.length - 1], testData[i].quote);
+
+        processedSrc = processedSrc.replace(/%hammerhead%/g, '%25hammerhead%25');
+
+        var decodedSrc = decodeURIComponent(processedSrc);
+        var expected   = testData[i].expected;
+
+        ok(decodedSrc.indexOf(expected[0]) !== -1 || decodedSrc.indexOf(expected[1]) !== -1);
+    }
+});
+
+test('target', function () {
+    var tagNames = ['a', 'form', 'area', 'base'];
+    var tag      = null;
+
+    for (var i = 0; i < tagNames.length; i++) {
+        tag = document.createElement(tagNames[i]);
+
+        tag.setAttribute('target', '_blank');
+        ok(!tag.getAttribute('target'));
+
+        tag.setAttribute('target', '_self');
+        ok(tag.getAttribute('target'));
+
+        setProperty(tag, 'target', '_blank');
+        ok(tag.target !== '_blank');
+    }
+});
+
+test('onclick', function () {
+    var link      = document.createElement('a');
+    var attrValue = 'location.href="managers.aspx";';
+
+    link.setAttribute('onclick', attrValue);
+
+    var attr       = nativeMethods.getAttribute.call(link, 'onclick');
+    var storedAttr = nativeMethods.getAttribute.call(link, domProcessor.getStoredAttrName('onclick'));
+
+    notEqual(attr, storedAttr);
+    strictEqual(storedAttr, attrValue);
+    strictEqual(attr, processScript(attrValue));
+    strictEqual(link.getAttribute('onclick'), attrValue);
+});
+
+test('event - javascript protocol', function () {
+    var link      = document.createElement('a');
+    var attrValue = 'javascript:location.href="managers.aspx";';
+
+    link.setAttribute('onclick', attrValue);
+
+    var attr       = nativeMethods.getAttribute.call(link, 'onclick');
+    var storedAttr = nativeMethods.getAttribute.call(link, domProcessor.getStoredAttrName('onclick'));
+
+    notEqual(attr, storedAttr);
+    strictEqual(storedAttr, attrValue);
+    strictEqual(attr, 'javascript:' + processScript(attrValue.replace('javascript:', '')));
+    strictEqual(link.getAttribute('onclick'), attrValue);
+});
+
+test('url - javascript: protocol', function () {
+    var link      = document.createElement('a');
+    var hrefValue = 'javascript:location.href="managers.aspx?Delete=814";';
+
+    link.setAttribute('href', hrefValue);
+
+    var href       = nativeMethods.getAttribute.call(link, 'href');
+    var storedHref = nativeMethods.getAttribute.call(link, domProcessor.getStoredAttrName('href'));
+
+    notEqual(href, storedHref);
+    strictEqual(storedHref, hrefValue);
+    strictEqual(href, 'javascript:' + processScript(hrefValue.replace('javascript:', '')));
+    strictEqual(link.getAttribute('href'), hrefValue);
+});
+
+test('iframe', function () {
+    var attr       = 'sandbox';
+    var storedAttr = domProcessor.getStoredAttrName(attr);
+    var iframe     = document.createElement('iframe');
+
+    ok(!nativeMethods.getAttribute.call(iframe, attr));
+    ok(!nativeMethods.getAttribute.call(iframe, storedAttr));
+    ok(!iframe.getAttribute(attr));
+
+    iframe.setAttribute(attr, 'allow-scripts');
+    strictEqual(nativeMethods.getAttribute.call(iframe, attr), 'allow-scripts allow-same-origin');
+    strictEqual(nativeMethods.getAttribute.call(iframe, storedAttr), 'allow-scripts');
+    strictEqual(iframe.getAttribute(attr), 'allow-scripts');
+
+    iframe.setAttribute(attr, 'allow-same-origin');
+    strictEqual(nativeMethods.getAttribute.call(iframe, attr), 'allow-same-origin allow-scripts');
+    strictEqual(nativeMethods.getAttribute.call(iframe, storedAttr), 'allow-same-origin');
+    strictEqual(iframe.getAttribute(attr), 'allow-same-origin');
+
+    iframe.setAttribute(attr, 'allow-scripts allow-same-origin');
+    strictEqual(nativeMethods.getAttribute.call(iframe, attr), 'allow-scripts allow-same-origin');
+    strictEqual(nativeMethods.getAttribute.call(iframe, storedAttr), 'allow-scripts allow-same-origin');
+    strictEqual(iframe.getAttribute(attr), 'allow-scripts allow-same-origin');
+
+    iframe.setAttribute(attr, 'allow-same-origin allow-forms');
+    strictEqual(nativeMethods.getAttribute.call(iframe, attr), 'allow-same-origin allow-forms allow-scripts');
+    strictEqual(nativeMethods.getAttribute.call(iframe, storedAttr), 'allow-same-origin allow-forms');
+    strictEqual(iframe.getAttribute(attr), 'allow-same-origin allow-forms');
+
+    iframe.setAttribute(attr, 'allow-scripts allow-forms');
+    strictEqual(nativeMethods.getAttribute.call(iframe, attr), 'allow-scripts allow-forms allow-same-origin');
+    strictEqual(nativeMethods.getAttribute.call(iframe, storedAttr), 'allow-scripts allow-forms');
+    strictEqual(iframe.getAttribute(attr), 'allow-scripts allow-forms');
+
+    iframe.setAttribute(attr, 'allow-scripts allow-forms allow-same-origin');
+    strictEqual(nativeMethods.getAttribute.call(iframe, attr), 'allow-scripts allow-forms allow-same-origin');
+    strictEqual(nativeMethods.getAttribute.call(iframe, storedAttr), 'allow-scripts allow-forms allow-same-origin');
+    strictEqual(iframe.getAttribute(attr), 'allow-scripts allow-forms allow-same-origin');
+
+    iframe.setAttribute(attr, 'allow-forms');
+    strictEqual(nativeMethods.getAttribute.call(iframe, attr), 'allow-forms allow-same-origin allow-scripts');
+    strictEqual(nativeMethods.getAttribute.call(iframe, storedAttr), 'allow-forms');
+    strictEqual(iframe.getAttribute(attr), 'allow-forms');
+});
+
+test('crossdomain iframe', function () {
+    var iframe        = document.createElement('iframe');
+    var storedSrcAttr = domProcessor.getStoredAttrName('src');
+
+    var savedGetProxyUrl                  = urlUtils.getProxyUrl;
+    var savedGetCrossDomainIframeProxyUrl = urlUtils.getCrossDomainIframeProxyUrl;
+
+    var crossDomainUrl      = 'http://cross.domain.com/';
+    var crossDomainProxyUrl = 'http://proxy.cross.domain.com/';
+    var proxyUrl            = 'http://proxy.com/';
+
+
+    urlUtils.getProxyUrl = function () {
+        return proxyUrl;
+    };
+
+    urlUtils.getCrossDomainIframeProxyUrl = function () {
+        return crossDomainProxyUrl;
+    };
+
+    setProperty(iframe, 'src', crossDomainUrl);
+    strictEqual(iframe.src, crossDomainProxyUrl);
+    strictEqual(nativeMethods.getAttribute.call(iframe, 'src'), crossDomainProxyUrl);
+    strictEqual(nativeMethods.getAttribute.call(iframe, storedSrcAttr), crossDomainUrl);
+
+    setProperty(iframe, 'src', location.toString() + '?param');
+    strictEqual(iframe.src, proxyUrl);
+    strictEqual(nativeMethods.getAttribute.call(iframe, 'src'), proxyUrl);
+    strictEqual(iframe.getAttribute('src'), location.toString() + '?param');
+
+    urlUtils.getProxyUrl                  = savedGetProxyUrl;
+    urlUtils.getCrossDomainIframeProxyUrl = savedGetCrossDomainIframeProxyUrl;
+});
+
+test('input.autocomplete', function () {
+    var input      = document.createElement('input');
+    var etalon     = nativeMethods.createElement.call(document, 'input');
+    var storedAttr = domProcessor.getStoredAttrName('autocomplete');
+
+    strictEqual(input.getAttribute('autocomplete'), nativeMethods.getAttribute.call(etalon, 'autocomplete'));
+    strictEqual(nativeMethods.getAttribute.call(input, 'autocomplete'), 'off');
+    strictEqual(nativeMethods.getAttribute.call(input, storedAttr), 'none');
+
+    input.setAttribute('autocomplete', 'off');
+    nativeMethods.setAttribute.call(etalon, 'autocomplete', 'off');
+    strictEqual(input.getAttribute('autocomplete'), nativeMethods.getAttribute.call(etalon, 'autocomplete'));
+    strictEqual(nativeMethods.getAttribute.call(input, 'autocomplete'), 'off');
+    strictEqual(nativeMethods.getAttribute.call(input, storedAttr), 'off');
+
+    input.setAttribute('autocomplete', 'on');
+    nativeMethods.setAttribute.call(etalon, 'autocomplete', 'on');
+    strictEqual(input.getAttribute('autocomplete'), nativeMethods.getAttribute.call(etalon, 'autocomplete'));
+    strictEqual(nativeMethods.getAttribute.call(input, 'autocomplete'), 'off');
+    strictEqual(nativeMethods.getAttribute.call(input, storedAttr), 'on');
+
+    input.setAttribute('autocomplete', '');
+    nativeMethods.setAttribute.call(etalon, 'autocomplete', '');
+    strictEqual(input.getAttribute('autocomplete'), nativeMethods.getAttribute.call(etalon, 'autocomplete'));
+    strictEqual(nativeMethods.getAttribute.call(input, 'autocomplete'), 'off');
+    strictEqual(nativeMethods.getAttribute.call(input, storedAttr), '');
+
+    input.removeAttribute('autocomplete');
+    nativeMethods.removeAttribute.call(etalon, 'autocomplete');
+    strictEqual(input.getAttribute('autocomplete'), nativeMethods.getAttribute.call(etalon, 'autocomplete'));
+    strictEqual(nativeMethods.getAttribute.call(input, 'autocomplete'), 'off');
+    strictEqual(nativeMethods.getAttribute.call(input, storedAttr), 'none');
+});
+
+test('window.onbeforeunload', function () {
+    var evName = 'on' + unloadSandbox.beforeUnloadEventName;
+
+    strictEqual(window[evName], null);
+    // NOTE: If this test fails, a system dialog blocks the page before it is unloaded.
+    setProperty(window, evName, function () {
+        return 'value';
+    });
+    ok(window[evName]);
+});
+
+test('element.innerHTML', function () {
+    settings.get().sessionId = 'sessionId';
+
+    var $container   = $('<div>');
+    var checkElement = function (el, attr, resourceType) {
+        var storedAttr     = domProcessor.getStoredAttrName(attr);
+        var exprectedValue = 'http://' + location.host + '/sessionId' + resourceType +
+                             '/https://example.com/Images/1.png';
+
+        strictEqual(nativeMethods.getAttribute.call(el, storedAttr), '/Images/1.png', 'destination url stored');
+        strictEqual(nativeMethods.getAttribute.call(el, attr), exprectedValue);
+    };
+
+    var html = ' <A iD = " fakeId1 " hRef = "/Images/1.png" attr="test" ></A>' +
+               ' <form iD="fakeId3 " action="/Images/1.png"    attr="test" ></form>' +
+               ' <link  iD = " fakeId5" href="/Images/1.png" attr="test" ></link>' +
+               ' <' + 'script  iD = "  fakeId6  " sRc=  "/Images/1.png" attr= "test"' + '>' + '</' + 'scriPt' + '>';
+
+    setProperty($container[0], 'innerHTML', html);
+
+    checkElement($container.find('a')[0], 'href', '');
+    checkElement($container.find('form')[0], 'action', '!f');
+    checkElement($container.find('link')[0], 'href', '');
+    checkElement($container.find('script')[0], 'src', '!s');
+});
+
+test('anchor with target attribute', function () {
+    var anchor   = document.createElement('a');
+    var url      = 'http://url.com/';
+    var iframe   = document.createElement('iframe');
+    var proxyUrl = urlUtils.getProxyUrl(url, null, null, null, 'i');
+
+    iframe.id   = 'test_unique_id_e16w9jnv5';
+    iframe.name = 'iframeName';
+    document.body.appendChild(iframe);
+
+    anchor.setAttribute('target', 'iframeName');
+
+    strictEqual(nativeMethods.getAttribute.call(anchor, 'target'), 'iframeName');
+
+    anchor.setAttribute('href', url);
+
+    var nativeHref = nativeMethods.getAttribute.call(anchor, 'href');
+
+    strictEqual(nativeHref, proxyUrl);
+    strictEqual(nativeMethods.getAttribute.call(anchor, domProcessor.getStoredAttrName('href')), url);
+    strictEqual(anchor.getAttribute('href'), url);
+    strictEqual(urlUtils.parseProxyUrl(nativeHref).resourceType, 'i');
+
+    iframe.parentNode.removeChild(iframe);
+});
+
+test('case insensitive target="_blank"', function () {
+    var link = document.createElement('a');
+
+    link.setAttribute('target', '_Blank');
+    ok(!link.getAttribute('target'));
+});
+
+module('regression');
+
+test('change href after target attribute changed (GH-534)', function () {
+    var iframe = document.createElement('iframe');
+    var check  = function (setTarget, clearTarget) {
+        var form = document.createElement('form');
+        var link = document.createElement('a');
+        var base = document.createElement('base');
+        var area = document.createElement('area');
+        var url  = 'http://some.domain.com/index.html';
+
+        form.setAttribute('action', url);
+        link.setAttribute('href', url);
+        base.setAttribute('href', url);
+        area.setAttribute('href', url);
+
+        strictEqual(urlUtils.parseProxyUrl(form.action).resourceType, 'f');
+        strictEqual(urlUtils.parseProxyUrl(link.href).resourceType, null);
+        strictEqual(urlUtils.parseProxyUrl(base.href).resourceType, null);
+        strictEqual(urlUtils.parseProxyUrl(area.href).resourceType, null);
+
+        setTarget(form);
+        setTarget(link);
+        setTarget(base);
+        setTarget(area);
+
+        strictEqual(urlUtils.parseProxyUrl(form.action).resourceType, 'if');
+        strictEqual(urlUtils.parseProxyUrl(link.href).resourceType, 'i');
+        strictEqual(urlUtils.parseProxyUrl(base.href).resourceType, 'i');
+        strictEqual(urlUtils.parseProxyUrl(area.href).resourceType, 'i');
+
+        clearTarget(form);
+        clearTarget(link);
+        clearTarget(base);
+        clearTarget(area);
+
+        strictEqual(urlUtils.parseProxyUrl(form.action).resourceType, 'f');
+        strictEqual(urlUtils.parseProxyUrl(link.href).resourceType, null);
+        strictEqual(urlUtils.parseProxyUrl(base.href).resourceType, null);
+        strictEqual(urlUtils.parseProxyUrl(area.href).resourceType, null);
+    };
+
+    iframe.id   = 'test_unique_id_ispt7enuo';
+    iframe.name = 'test-window';
+    document.body.appendChild(iframe);
+
+    check(function (el) {
+        el.setAttribute('target', 'test-window');
+    }, function (el) {
+        el.removeAttribute('target');
+    });
+
+    check(function (el) {
+        el.setAttribute('target', 'test-window');
+    }, function (el) {
+        el.setAttribute('target', '');
+    });
+
+    check(function (el) {
+        setProperty(el, 'target', 'test-window');
+    }, function (el) {
+        setProperty(el, 'target', '');
+    });
+
+    check(function (el) {
+        el.setAttribute('target', 'test-window');
+    }, function (el) {
+        el.setAttribute('target', '_Self');
+    });
+
+    iframe.parentNode.removeChild(iframe);
+});
+
+test('setting function to the link.href attribute value (T230764)', function () {
+    var a     = document.createElement('a');
+    var error = false;
+
+    try {
+        a.setAttribute('href', function () { /* */
+        });
+    }
+    catch (e) {
+        error = true;
+    }
+    finally {
+        ok(!error);
+    }
+});
diff --git a/test/client/fixtures/sandbox/node/window-test.js b/test/client/fixtures/sandbox/node/window-test.js
index b6703bfa6..21de105c2 100644
--- a/test/client/fixtures/sandbox/node/window-test.js
+++ b/test/client/fixtures/sandbox/node/window-test.js
@@ -1,130 +1,130 @@
-var urlUtils = hammerhead.get('./utils/url');
-
-var nativeMethods = hammerhead.nativeMethods;
-var browserUtils  = hammerhead.utils.browser;
-
-test('window.onerror setter/getter', function () {
-    strictEqual(getProperty(window, 'onerror'), null);
-
-    setProperty(window, 'onerror', 123);
-    strictEqual(getProperty(window, 'onerror'), null);
-
-    var handler = function () {
-    };
-
-    setProperty(window, 'onerror', handler);
-    strictEqual(getProperty(window, 'onerror'), handler);
-});
-
-if (window.FontFace) {
-    asyncTest('FontFace', function () {
-        var nativeFontFace = nativeMethods.FontFace;
-        var url            = 'https://fonts.com/fs_albert.woff2';
-        var desc           = {};
-
-        nativeMethods.FontFace = function (family, source, descriptors) {
-            strictEqual(family, 'family');
-            strictEqual(source, 'url("' + urlUtils.getProxyUrl(url) + '")');
-            ok(descriptors, desc);
-
-            nativeMethods.FontFace = nativeFontFace;
-            start();
-        };
-
-        return new FontFace('family', 'url("' + url + '")', desc);
-    });
-}
-
-test('parameters passed to the native function in its original form', function () {
-    // XHR
-    var xhr = new nativeMethods.XMLHttpRequest();
-
-    checkNativeFunctionArgs('abort', 'xmlHttpRequestAbort', xhr);
-    checkNativeFunctionArgs('open', 'xmlHttpRequestOpen', xhr);
-    checkNativeFunctionArgs('addEventListener', 'xmlHttpRequestAddEventListener', xhr);
-    checkNativeFunctionArgs('removeEventListener', 'xmlHttpRequestRemoveEventListener', xhr);
-
-    xhr.setRequestHeader = function () {
-    };
-    checkNativeFunctionArgs('send', 'xmlHttpRequestSend', xhr);
-
-    // registerServiceWorker
-    if (nativeMethods.registerServiceWorker)
-        checkNativeFunctionArgs('register', 'registerServiceWorker', window.navigator.serviceWorker);
-
-    // Event
-    checkNativeFunctionArgs('addEventListener', 'windowAddEventListener', window);
-    checkNativeFunctionArgs('removeEventListener', 'windowRemoveEventListener', window);
-
-    // Canvas
-    var canvas = document.createElement('canvas');
-
-    checkNativeFunctionArgs('drawImage', 'canvasContextDrawImage', canvas.getContext('2d'));
-
-    // FormData
-    if (window.FormData)
-        checkNativeFunctionArgs('append', 'formDataAppend', new window.FormData());
-
-    if (window.navigator.registerProtocolHandler)
-        checkNativeFunctionArgs('registerProtocolHandler', 'registerProtocolHandler', window.navigator);
-
-    if (!browserUtils.isIE || browserUtils.version >= 12) {
-        checkNativeFunctionArgs('setTimeout', 'setTimeout', window);
-        checkNativeFunctionArgs('setTimeout', 'setTimeout', window);
-    }
-
-    if (window.history.pushState && window.history.replaceState) {
-        checkNativeFunctionArgs('pushState', 'historyPushState', window.history);
-        checkNativeFunctionArgs('replaceState', 'historyReplaceState', window.history);
-    }
-
-    var documentFragment = document.createDocumentFragment();
-
-    checkNativeFunctionArgs('querySelector', 'documentFragmentQuerySelector', documentFragment);
-    checkNativeFunctionArgs('querySelectorAll', 'documentFragmentQuerySelectorAll', documentFragment);
-    checkNativeFunctionArgs('dispatchEvent', 'windowDispatchEvent', window);
-});
-
-module('regression');
-
-// NOTE: https://connect.microsoft.com/IE/feedback/details/801810/web-workers-from-blob-urls-in-ie-10-and-11
-var isWorkerFromBlobSupported = (function () {
-    try {
-        return !!new Worker(URL.createObjectURL(new Blob(['var a = 42;'])));
-    }
-    catch (e) {
-        return false;
-    }
-})();
-
-if (isWorkerFromBlobSupported) {
-    asyncTest('blob should try to process data as a script even if the content type is not passed (GH-231)', function () {
-        var script  = 'var obj = {}, prop = "prop"; obj[prop] = true; postMessage(true);';
-        var blobURL = URL.createObjectURL(new Blob([script]));
-
-        new Worker(blobURL).onmessage = function (e) {
-            ok(e.data);
-            start();
-        };
-    });
-}
-
-test('window.onerror must be overriden (B238830)', function () {
-    var error     = false;
-    var windowObj = window.Window;
-
-    window.onerror = function () {
-        error = true;
-    };
-
-    window.Window = function () {
-    };
-
-    window.addEventListener('click', function () {
-    });
-
-    window.Window = windowObj;
-
-    ok(!error);
-});
-
+var urlUtils = hammerhead.get('./utils/url');
+
+var nativeMethods = hammerhead.nativeMethods;
+var browserUtils  = hammerhead.utils.browser;
+
+test('window.onerror setter/getter', function () {
+    strictEqual(getProperty(window, 'onerror'), null);
+
+    setProperty(window, 'onerror', 123);
+    strictEqual(getProperty(window, 'onerror'), null);
+
+    var handler = function () {
+    };
+
+    setProperty(window, 'onerror', handler);
+    strictEqual(getProperty(window, 'onerror'), handler);
+});
+
+if (window.FontFace) {
+    asyncTest('FontFace', function () {
+        var nativeFontFace = nativeMethods.FontFace;
+        var url            = 'https://fonts.com/fs_albert.woff2';
+        var desc           = {};
+
+        nativeMethods.FontFace = function (family, source, descriptors) {
+            strictEqual(family, 'family');
+            strictEqual(source, 'url("' + urlUtils.getProxyUrl(url) + '")');
+            ok(descriptors, desc);
+
+            nativeMethods.FontFace = nativeFontFace;
+            start();
+        };
+
+        return new FontFace('family', 'url("' + url + '")', desc);
+    });
+}
+
+test('parameters passed to the native function in its original form', function () {
+    // XHR
+    var xhr = new nativeMethods.XMLHttpRequest();
+
+    checkNativeFunctionArgs('abort', 'xmlHttpRequestAbort', xhr);
+    checkNativeFunctionArgs('open', 'xmlHttpRequestOpen', xhr);
+    checkNativeFunctionArgs('addEventListener', 'xmlHttpRequestAddEventListener', xhr);
+    checkNativeFunctionArgs('removeEventListener', 'xmlHttpRequestRemoveEventListener', xhr);
+
+    xhr.setRequestHeader = function () {
+    };
+    checkNativeFunctionArgs('send', 'xmlHttpRequestSend', xhr);
+
+    // registerServiceWorker
+    if (nativeMethods.registerServiceWorker)
+        checkNativeFunctionArgs('register', 'registerServiceWorker', window.navigator.serviceWorker);
+
+    // Event
+    checkNativeFunctionArgs('addEventListener', 'windowAddEventListener', window);
+    checkNativeFunctionArgs('removeEventListener', 'windowRemoveEventListener', window);
+
+    // Canvas
+    var canvas = document.createElement('canvas');
+
+    checkNativeFunctionArgs('drawImage', 'canvasContextDrawImage', canvas.getContext('2d'));
+
+    // FormData
+    if (window.FormData)
+        checkNativeFunctionArgs('append', 'formDataAppend', new window.FormData());
+
+    if (window.navigator.registerProtocolHandler)
+        checkNativeFunctionArgs('registerProtocolHandler', 'registerProtocolHandler', window.navigator);
+
+    if (!browserUtils.isIE || browserUtils.version >= 12) {
+        checkNativeFunctionArgs('setTimeout', 'setTimeout', window);
+        checkNativeFunctionArgs('setTimeout', 'setTimeout', window);
+    }
+
+    if (window.history.pushState && window.history.replaceState) {
+        checkNativeFunctionArgs('pushState', 'historyPushState', window.history);
+        checkNativeFunctionArgs('replaceState', 'historyReplaceState', window.history);
+    }
+
+    var documentFragment = document.createDocumentFragment();
+
+    checkNativeFunctionArgs('querySelector', 'documentFragmentQuerySelector', documentFragment);
+    checkNativeFunctionArgs('querySelectorAll', 'documentFragmentQuerySelectorAll', documentFragment);
+    checkNativeFunctionArgs('dispatchEvent', 'windowDispatchEvent', window);
+});
+
+module('regression');
+
+// NOTE: https://connect.microsoft.com/IE/feedback/details/801810/web-workers-from-blob-urls-in-ie-10-and-11
+var isWorkerFromBlobSupported = (function () {
+    try {
+        return !!new Worker(URL.createObjectURL(new Blob(['var a = 42;'])));
+    }
+    catch (e) {
+        return false;
+    }
+})();
+
+if (isWorkerFromBlobSupported) {
+    asyncTest('blob should try to process data as a script even if the content type is not passed (GH-231)', function () {
+        var script  = 'var obj = {}, prop = "prop"; obj[prop] = true; postMessage(true);';
+        var blobURL = URL.createObjectURL(new Blob([script]));
+
+        new Worker(blobURL).onmessage = function (e) {
+            ok(e.data);
+            start();
+        };
+    });
+}
+
+test('window.onerror must be overriden (B238830)', function () {
+    var error     = false;
+    var windowObj = window.Window;
+
+    window.onerror = function () {
+        error = true;
+    };
+
+    window.Window = function () {
+    };
+
+    window.addEventListener('click', function () {
+    });
+
+    window.Window = windowObj;
+
+    ok(!error);
+});
+
diff --git a/test/client/fixtures/sandbox/storages-test.js b/test/client/fixtures/sandbox/storages-test.js
index e45bdbe4e..bf731344a 100644
--- a/test/client/fixtures/sandbox/storages-test.js
+++ b/test/client/fixtures/sandbox/storages-test.js
@@ -1,418 +1,418 @@
-var StorageWrapper = hammerhead.get('./sandbox/storages/wrapper');
-var settings       = hammerhead.get('./settings');
-
-var storageSandbox = hammerhead.sandbox.storageSandbox;
-var iframeSandbox  = hammerhead.sandbox.iframe;
-var Promise        = hammerhead.Promise;
-var isIE           = hammerhead.utils.browser.isIE;
-
-var storageWrapperKey = 'hammerhead|storage-wrapper|' + settings.get().sessionId + '|example.com';
-
-QUnit.testStart(function () {
-    // NOTE: Clean up storage wrappers
-    window.localStorage.clear();
-    window.sessionStorage.clear();
-    storageSandbox.localStorage.clear();
-    storageSandbox.sessionStorage.clear();
-
-    iframeSandbox.on(iframeSandbox.RUN_TASK_SCRIPT, initIframeTestHandler);
-    iframeSandbox.off(iframeSandbox.RUN_TASK_SCRIPT, iframeSandbox.iframeReadyToInitHandler);
-});
-
-QUnit.testDone(function () {
-    iframeSandbox.off(iframeSandbox.RUN_TASK_SCRIPT, initIframeTestHandler);
-});
-
-function waitStorageUpdated () {
-    return new Promise(function (resolve) {
-        window.setTimeout(resolve, 100);
-    });
-}
-
-function waitStorageEvent (window, action) {
-    return new Promise(function (resolve) {
-        var handler = function (e) {
-            window.removeEventListener('storage', handler);
-            resolve(e);
-        };
-
-        window.addEventListener('storage', handler);
-        action();
-    });
-}
-
-module('storage API');
-
-test('argument types', function () {
-    var storageWrapper = storageSandbox.localStorage;
-
-    storageWrapper.setItem({}, 'value');
-    strictEqual(storageWrapper.getItem({}), 'value');
-
-    storageWrapper.setItem({}, null);
-    strictEqual(storageWrapper.getItem({}), 'null');
-
-    storageWrapper.setItem(null, 'value1');
-    strictEqual(storageWrapper.getItem(null), 'value1');
-});
-
-test('get item', function () {
-    var storageWrapper = storageSandbox.sessionStorage;
-
-    storageWrapper.setItem('key1', 'value1');
-    storageWrapper.setItem('key2', 'value2');
-
-    strictEqual(storageWrapper.getItem('key1'), 'value1');
-    strictEqual(storageWrapper.getItem('key2'), 'value2');
-    strictEqual(storageWrapper.getItem('key3'), null);
-});
-
-test('set item', function () {
-    var storageWrapper = storageSandbox.localStorage;
-
-    storageWrapper.setItem('key1', 'value1');
-    storageWrapper.setItem('key2', {});
-
-    strictEqual(storageWrapper.length, 2);
-    strictEqual(storageWrapper.getItem('key1'), 'value1');
-    strictEqual(storageWrapper.getItem('key2'), '[object Object]');
-
-    storageWrapper.setItem('key1', null);
-    storageWrapper.setItem('key2', 'newValue');
-
-    strictEqual(storageWrapper.length, 2);
-    strictEqual(storageWrapper.getItem('key1'), 'null');
-    strictEqual(storageWrapper.getItem('key2'), 'newValue');
-});
-
-test('get key', function () {
-    var storageWrapper = storageSandbox.sessionStorage;
-
-    storageWrapper.setItem('key1', 'value1');
-    storageWrapper.setItem('key2', 'value2');
-
-    strictEqual(storageWrapper.length, 2);
-    strictEqual(storageWrapper.key(-1), null);
-    strictEqual(storageWrapper.key(0), 'key1');
-    strictEqual(storageWrapper.key(1), 'key2');
-    strictEqual(storageWrapper.key(2), null);
-});
-
-test('remove item', function () {
-    var storageWrapper = storageSandbox.localStorage;
-
-    storageWrapper.setItem('key1', 'value1');
-    storageWrapper.setItem('key2', 'value2');
-
-    storageWrapper.removeItem('key3');
-    strictEqual(storageWrapper.length, 2);
-    storageWrapper.removeItem('key1');
-    strictEqual(storageWrapper.length, 1);
-    strictEqual(storageWrapper.getItem('key1'), null);
-    strictEqual(storageWrapper.getItem('key2'), 'value2');
-    strictEqual(storageWrapper.key(0), 'key2');
-    strictEqual(storageWrapper.key(1), null);
-});
-
-test('storage length', function () {
-    var storageWrapper = storageSandbox.sessionStorage;
-
-    storageWrapper.clear();
-    strictEqual(storageWrapper.length, 0);
-
-    storageWrapper.setItem('key1', 'value1');
-    strictEqual(storageWrapper.length, 1);
-
-    storageWrapper.setItem('key2', 'value2');
-    strictEqual(storageWrapper.length, 2);
-
-    storageWrapper.removeItem('key2');
-    strictEqual(storageWrapper.length, 1);
-
-    storageWrapper.clear();
-    strictEqual(storageWrapper.length, 0);
-});
-
-module('code instrumentation');
-
-test('global invoke', function () {
-    var localStorageWrapper   = storageSandbox.localStorage;
-    var sessionStorageWrapper = storageSandbox.sessionStorage;
-
-    eval(processScript('localStorage.key1 = "value1"'));
-    eval(processScript('sessionStorage.key2 = "value2"'));
-
-    strictEqual(localStorageWrapper.key1, 'value1');
-    strictEqual(sessionStorageWrapper.key2, 'value2');
-
-    localStorageWrapper.setItem('key3', 'value3');
-    sessionStorageWrapper.setItem('key4', 'value4');
-
-    strictEqual(eval(processScript('localStorage.key3')), 'value3');
-    strictEqual(eval(processScript('sessionStorage.key4')), 'value4');
-
-    eval(processScript('localStorage.setItem("key5", "value5")'));
-    eval(processScript('sessionStorage.setItem("key6", "value6")'));
-
-    strictEqual(localStorageWrapper.key5, 'value5');
-    strictEqual(sessionStorageWrapper.key6, 'value6');
-
-    eval(processScript('window.localStorage.setItem("key7", "value7")'));
-    eval(processScript('window.sessionStorage.setItem("key8", "value8")'));
-
-    strictEqual(localStorageWrapper.key7, 'value7');
-    strictEqual(sessionStorageWrapper.key8, 'value8');
-
-    eval(processScript('window["localStorage"].setItem("key9", "value9")'));
-    eval(processScript('window["sessionStorage"].setItem("key10", "value10")'));
-
-    strictEqual(localStorageWrapper.key9, 'value9');
-    strictEqual(sessionStorageWrapper.key10, 'value10');
-
-    eval(processScript('localStorage["setItem"]("key11", "value11")'));
-    eval(processScript('sessionStorage["setItem"]("key12", "value12")'));
-
-    strictEqual(localStorageWrapper.key11, 'value11');
-    strictEqual(sessionStorageWrapper.key12, 'value12');
-
-    eval(processScript('localStorage["key13"] = "value13"'));
-    eval(processScript('sessionStorage["key14"] = "value14"'));
-
-    strictEqual(localStorageWrapper.key13, 'value13');
-    strictEqual(sessionStorageWrapper.key14, 'value14');
-
-    eval(processScript('var key = "key15"; localStorage[key] = "value15"'));
-    eval(processScript('var key = "key16"; sessionStorage[key] = "value16"'));
-
-    strictEqual(localStorageWrapper.key15, 'value15');
-    strictEqual(sessionStorageWrapper.key16, 'value16');
-});
-
-test('invoke as a member', function () {
-    var localStorageWrapper   = storageSandbox.localStorage;
-    var sessionStorageWrapper = storageSandbox.sessionStorage;
-
-    strictEqual(eval(processScript('window.localStorage')), localStorageWrapper);
-    strictEqual(eval(processScript('window.sessionStorage')), sessionStorageWrapper);
-
-    strictEqual(eval(processScript('window["localStorage"]')), localStorageWrapper);
-    strictEqual(eval(processScript('window["sessionStorage"]')), sessionStorageWrapper);
-
-    /* eslint-disable no-unused-vars */
-    var localStorageLiteral   = 'localStorage';
-    var sessionStorageLiteral = 'sessionStorage';
-    /* eslint-enable no-unused-vars */
-
-    strictEqual(eval(processScript('window[localStorageLiteral]')), localStorageWrapper);
-    strictEqual(eval(processScript('window[sessionStorageLiteral]')), sessionStorageWrapper);
-});
-
-module('direct record to the storage');
-
-test('setter', function () {
-    var storageWrapper = storageSandbox.sessionStorage;
-
-    storageWrapper.key1 = 'value1';
-    strictEqual(storageWrapper.getItem('key1'), 'value1');
-    strictEqual(storageWrapper.length, 1);
-
-    storageWrapper.key1 = 'newValue';
-    strictEqual(storageWrapper.getItem('key1'), 'newValue');
-    strictEqual(storageWrapper.length, 1);
-});
-
-test('getter', function () {
-    var storageWrapper = storageSandbox.localStorage;
-
-    storageWrapper.setItem('key1', 'value1');
-    strictEqual(storageWrapper.key1, 'value1');
-
-    storageWrapper.setItem('key1', null);
-    strictEqual(storageWrapper.key1, 'null');
-
-    storageWrapper.setItem(null, null);
-    strictEqual(storageWrapper.null, 'null');
-
-    storageWrapper.removeItem(null);
-    strictEqual(storageWrapper.null, void 0);
-});
-
-module('area of visibility');
-
-asyncTest('iframe with empty src', function () {
-    var topStorage = storageSandbox.localStorage;
-    var iframe     = document.createElement('iframe');
-
-    iframe.id       = 'test001';
-    topStorage.key1 = 'value1';
-
-    window.QUnitGlobals.waitForIframe(iframe)
-        .then(function () {
-            var iframeStorage = iframe.contentWindow['%hammerhead%'].sandbox.storageSandbox.localStorage;
-
-            strictEqual(iframeStorage.key1, 'value1');
-
-            iframeStorage.key2 = 'value2';
-            topStorage.key3    = 'value3';
-
-            strictEqual(topStorage.key2, 'value2');
-            strictEqual(iframeStorage.key3, 'value3');
-
-            $(iframe).remove();
-            start();
-        });
-
-    document.body.appendChild(iframe);
-});
-
-module('sync state with native');
-
-test('storages load their state from native', function () {
-    localStorage[storageWrapperKey]   = '[[ "key1" ],[ "value1" ]]';
-    sessionStorage[storageWrapperKey] = '[[ "key2" ],[ "value2" ]]';
-
-    var localSandboxWrapper   = new StorageWrapper(window, localStorage, storageWrapperKey, hammerhead.sandbox.event.listeners);
-    var sessionSandboxWrapper = new StorageWrapper(window, sessionStorage, storageWrapperKey, hammerhead.sandbox.event.listeners);
-
-    strictEqual(localSandboxWrapper.key1, 'value1');
-    strictEqual(sessionSandboxWrapper.key2, 'value2');
-});
-
-test('storages save their state on the beforeunload event', function () {
-    storageSandbox.localStorage.key1   = 'value1';
-    storageSandbox.sessionStorage.key2 = 'value2';
-
-    ok(!localStorage[storageWrapperKey]);
-    ok(!sessionStorage[storageWrapperKey]);
-
-    // NOTE: Simulate page leaving
-    hammerhead.sandbox.event.unload._emitBeforeUnloadEvent();
-
-    strictEqual(localStorage[storageWrapperKey], JSON.stringify([['key1'], ['value1']]));
-    strictEqual(sessionStorage[storageWrapperKey], JSON.stringify([['key2'], ['value2']]));
-});
-
-module('storage changed event');
-
-asyncTest('event firing in all same host windows', function () {
-    var topStorage    = storageSandbox.localStorage;
-    var iframeStorage = null;
-    var iframe        = document.createElement('iframe');
-
-    var topStorageEventArgs    = [];
-    var iframeStorageEventArgs = [];
-
-    var topWindowHandler = function (e) {
-        topStorageEventArgs.push(e);
-    };
-
-    var iframeWindowHandler = function (e) {
-        iframeStorageEventArgs.push(e);
-    };
-
-    iframe.id = 'test001';
-
-    window.QUnitGlobals.waitForIframe(iframe)
-        .then(function () {
-            iframeStorage = iframe.contentWindow['%hammerhead%'].sandbox.storageSandbox.localStorage;
-
-            window.addEventListener('storage', topWindowHandler);
-            iframe.contentWindow.addEventListener('storage', iframeWindowHandler);
-
-            iframeStorage.key1 = 'value1';
-
-            return waitStorageUpdated();
-        })
-        .then(function () {
-            strictEqual(topStorageEventArgs.length, 1);
-            strictEqual(iframeStorageEventArgs.length, 1);
-
-            strictEqual(topStorageEventArgs[0].key, 'key1');
-            strictEqual(topStorageEventArgs[0].oldValue, isIE ? '' : null);
-            strictEqual(topStorageEventArgs[0].newValue, 'value1');
-            // NOTE: We can't detect who changed the storage.
-            // strictEqual(topStorageEventArgs[0].url, 'https://iframe.example.com');
-            strictEqual(topStorageEventArgs[0].storageArea, iframeStorage);
-
-            strictEqual(iframeStorageEventArgs[0].key, 'key1');
-            strictEqual(iframeStorageEventArgs[0].oldValue, isIE ? '' : null);
-            strictEqual(iframeStorageEventArgs[0].newValue, 'value1');
-            // NOTE: We can't detect who changed the storage.
-            // strictEqual(iframeStorageEventArgs[0].url, 'https://iframe.example.com');
-            strictEqual(iframeStorageEventArgs[0].storageArea, iframeStorage);
-
-            topStorage.key2 = 'value2';
-
-            return waitStorageUpdated();
-        })
-        .then(function () {
-            strictEqual(topStorageEventArgs.length, 2);
-            strictEqual(iframeStorageEventArgs.length, 2);
-
-            strictEqual(topStorageEventArgs[1].key, 'key2');
-            strictEqual(topStorageEventArgs[1].oldValue, isIE ? '' : null);
-            strictEqual(topStorageEventArgs[1].newValue, 'value2');
-            // NOTE: We can't detect who changed the storage.
-            // strictEqual(topStorageEventArgs[1].url, 'https://example.com');
-            strictEqual(topStorageEventArgs[1].storageArea, topStorage);
-
-            strictEqual(iframeStorageEventArgs[1].key, 'key2');
-            strictEqual(iframeStorageEventArgs[1].oldValue, isIE ? '' : null);
-            strictEqual(iframeStorageEventArgs[1].newValue, 'value2');
-            // NOTE: We can't detect who changed the storage.
-            // strictEqual(iframeStorageEventArgs[1].url, 'https://example.com');
-            strictEqual(iframeStorageEventArgs[1].storageArea, topStorage);
-
-            window.removeEventListener('storage', topWindowHandler);
-            $(iframe).remove();
-            start();
-        });
-
-    document.body.appendChild(iframe);
-});
-
-asyncTest('event argument parameters', function () {
-    storageSandbox.localStorage.clear();
-
-    var checkEventArg = function (e, key, oldValue, newValue) {
-        strictEqual(e.key, key);
-        strictEqual(e.oldValue, oldValue);
-        strictEqual(e.newValue, newValue);
-        // NOTE: We can't detect who changed the storage.
-        // strictEqual(e.url, 'https://example.com');
-        strictEqual(e.storageArea, storageSandbox.localStorage);
-    };
-
-    waitStorageUpdated()
-        .then(function () {
-            return waitStorageEvent(window, function () {
-                storageSandbox.localStorage.key1 = 'value1';
-            });
-        })
-        .then(function (e) {
-            checkEventArg(e, 'key1', isIE ? '' : null, 'value1');
-
-            return waitStorageEvent(window, function () {
-                storageSandbox.localStorage.key2 = 'value2';
-            });
-        })
-        .then(function (e) {
-            checkEventArg(e, 'key2', isIE ? '' : null, 'value2');
-
-            return waitStorageEvent(window, function () {
-                storageSandbox.localStorage.key1 = 'value3';
-            });
-        })
-        .then(function (e) {
-            checkEventArg(e, 'key1', 'value1', 'value3');
-
-            return waitStorageEvent(window, function () {
-                storageSandbox.localStorage.removeItem('key1');
-            });
-        })
-        .then(function (e) {
-            checkEventArg(e, 'key1', 'value3', isIE ? 'null' : null);
-
-            start();
-        });
-});
+var StorageWrapper = hammerhead.get('./sandbox/storages/wrapper');
+var settings       = hammerhead.get('./settings');
+
+var storageSandbox = hammerhead.sandbox.storageSandbox;
+var iframeSandbox  = hammerhead.sandbox.iframe;
+var Promise        = hammerhead.Promise;
+var isIE           = hammerhead.utils.browser.isIE;
+
+var storageWrapperKey = 'hammerhead|storage-wrapper|' + settings.get().sessionId + '|example.com';
+
+QUnit.testStart(function () {
+    // NOTE: Clean up storage wrappers
+    window.localStorage.clear();
+    window.sessionStorage.clear();
+    storageSandbox.localStorage.clear();
+    storageSandbox.sessionStorage.clear();
+
+    iframeSandbox.on(iframeSandbox.RUN_TASK_SCRIPT, initIframeTestHandler);
+    iframeSandbox.off(iframeSandbox.RUN_TASK_SCRIPT, iframeSandbox.iframeReadyToInitHandler);
+});
+
+QUnit.testDone(function () {
+    iframeSandbox.off(iframeSandbox.RUN_TASK_SCRIPT, initIframeTestHandler);
+});
+
+function waitStorageUpdated () {
+    return new Promise(function (resolve) {
+        window.setTimeout(resolve, 100);
+    });
+}
+
+function waitStorageEvent (window, action) {
+    return new Promise(function (resolve) {
+        var handler = function (e) {
+            window.removeEventListener('storage', handler);
+            resolve(e);
+        };
+
+        window.addEventListener('storage', handler);
+        action();
+    });
+}
+
+module('storage API');
+
+test('argument types', function () {
+    var storageWrapper = storageSandbox.localStorage;
+
+    storageWrapper.setItem({}, 'value');
+    strictEqual(storageWrapper.getItem({}), 'value');
+
+    storageWrapper.setItem({}, null);
+    strictEqual(storageWrapper.getItem({}), 'null');
+
+    storageWrapper.setItem(null, 'value1');
+    strictEqual(storageWrapper.getItem(null), 'value1');
+});
+
+test('get item', function () {
+    var storageWrapper = storageSandbox.sessionStorage;
+
+    storageWrapper.setItem('key1', 'value1');
+    storageWrapper.setItem('key2', 'value2');
+
+    strictEqual(storageWrapper.getItem('key1'), 'value1');
+    strictEqual(storageWrapper.getItem('key2'), 'value2');
+    strictEqual(storageWrapper.getItem('key3'), null);
+});
+
+test('set item', function () {
+    var storageWrapper = storageSandbox.localStorage;
+
+    storageWrapper.setItem('key1', 'value1');
+    storageWrapper.setItem('key2', {});
+
+    strictEqual(storageWrapper.length, 2);
+    strictEqual(storageWrapper.getItem('key1'), 'value1');
+    strictEqual(storageWrapper.getItem('key2'), '[object Object]');
+
+    storageWrapper.setItem('key1', null);
+    storageWrapper.setItem('key2', 'newValue');
+
+    strictEqual(storageWrapper.length, 2);
+    strictEqual(storageWrapper.getItem('key1'), 'null');
+    strictEqual(storageWrapper.getItem('key2'), 'newValue');
+});
+
+test('get key', function () {
+    var storageWrapper = storageSandbox.sessionStorage;
+
+    storageWrapper.setItem('key1', 'value1');
+    storageWrapper.setItem('key2', 'value2');
+
+    strictEqual(storageWrapper.length, 2);
+    strictEqual(storageWrapper.key(-1), null);
+    strictEqual(storageWrapper.key(0), 'key1');
+    strictEqual(storageWrapper.key(1), 'key2');
+    strictEqual(storageWrapper.key(2), null);
+});
+
+test('remove item', function () {
+    var storageWrapper = storageSandbox.localStorage;
+
+    storageWrapper.setItem('key1', 'value1');
+    storageWrapper.setItem('key2', 'value2');
+
+    storageWrapper.removeItem('key3');
+    strictEqual(storageWrapper.length, 2);
+    storageWrapper.removeItem('key1');
+    strictEqual(storageWrapper.length, 1);
+    strictEqual(storageWrapper.getItem('key1'), null);
+    strictEqual(storageWrapper.getItem('key2'), 'value2');
+    strictEqual(storageWrapper.key(0), 'key2');
+    strictEqual(storageWrapper.key(1), null);
+});
+
+test('storage length', function () {
+    var storageWrapper = storageSandbox.sessionStorage;
+
+    storageWrapper.clear();
+    strictEqual(storageWrapper.length, 0);
+
+    storageWrapper.setItem('key1', 'value1');
+    strictEqual(storageWrapper.length, 1);
+
+    storageWrapper.setItem('key2', 'value2');
+    strictEqual(storageWrapper.length, 2);
+
+    storageWrapper.removeItem('key2');
+    strictEqual(storageWrapper.length, 1);
+
+    storageWrapper.clear();
+    strictEqual(storageWrapper.length, 0);
+});
+
+module('code instrumentation');
+
+test('global invoke', function () {
+    var localStorageWrapper   = storageSandbox.localStorage;
+    var sessionStorageWrapper = storageSandbox.sessionStorage;
+
+    eval(processScript('localStorage.key1 = "value1"'));
+    eval(processScript('sessionStorage.key2 = "value2"'));
+
+    strictEqual(localStorageWrapper.key1, 'value1');
+    strictEqual(sessionStorageWrapper.key2, 'value2');
+
+    localStorageWrapper.setItem('key3', 'value3');
+    sessionStorageWrapper.setItem('key4', 'value4');
+
+    strictEqual(eval(processScript('localStorage.key3')), 'value3');
+    strictEqual(eval(processScript('sessionStorage.key4')), 'value4');
+
+    eval(processScript('localStorage.setItem("key5", "value5")'));
+    eval(processScript('sessionStorage.setItem("key6", "value6")'));
+
+    strictEqual(localStorageWrapper.key5, 'value5');
+    strictEqual(sessionStorageWrapper.key6, 'value6');
+
+    eval(processScript('window.localStorage.setItem("key7", "value7")'));
+    eval(processScript('window.sessionStorage.setItem("key8", "value8")'));
+
+    strictEqual(localStorageWrapper.key7, 'value7');
+    strictEqual(sessionStorageWrapper.key8, 'value8');
+
+    eval(processScript('window["localStorage"].setItem("key9", "value9")'));
+    eval(processScript('window["sessionStorage"].setItem("key10", "value10")'));
+
+    strictEqual(localStorageWrapper.key9, 'value9');
+    strictEqual(sessionStorageWrapper.key10, 'value10');
+
+    eval(processScript('localStorage["setItem"]("key11", "value11")'));
+    eval(processScript('sessionStorage["setItem"]("key12", "value12")'));
+
+    strictEqual(localStorageWrapper.key11, 'value11');
+    strictEqual(sessionStorageWrapper.key12, 'value12');
+
+    eval(processScript('localStorage["key13"] = "value13"'));
+    eval(processScript('sessionStorage["key14"] = "value14"'));
+
+    strictEqual(localStorageWrapper.key13, 'value13');
+    strictEqual(sessionStorageWrapper.key14, 'value14');
+
+    eval(processScript('var key = "key15"; localStorage[key] = "value15"'));
+    eval(processScript('var key = "key16"; sessionStorage[key] = "value16"'));
+
+    strictEqual(localStorageWrapper.key15, 'value15');
+    strictEqual(sessionStorageWrapper.key16, 'value16');
+});
+
+test('invoke as a member', function () {
+    var localStorageWrapper   = storageSandbox.localStorage;
+    var sessionStorageWrapper = storageSandbox.sessionStorage;
+
+    strictEqual(eval(processScript('window.localStorage')), localStorageWrapper);
+    strictEqual(eval(processScript('window.sessionStorage')), sessionStorageWrapper);
+
+    strictEqual(eval(processScript('window["localStorage"]')), localStorageWrapper);
+    strictEqual(eval(processScript('window["sessionStorage"]')), sessionStorageWrapper);
+
+    /* eslint-disable no-unused-vars */
+    var localStorageLiteral   = 'localStorage';
+    var sessionStorageLiteral = 'sessionStorage';
+    /* eslint-enable no-unused-vars */
+
+    strictEqual(eval(processScript('window[localStorageLiteral]')), localStorageWrapper);
+    strictEqual(eval(processScript('window[sessionStorageLiteral]')), sessionStorageWrapper);
+});
+
+module('direct record to the storage');
+
+test('setter', function () {
+    var storageWrapper = storageSandbox.sessionStorage;
+
+    storageWrapper.key1 = 'value1';
+    strictEqual(storageWrapper.getItem('key1'), 'value1');
+    strictEqual(storageWrapper.length, 1);
+
+    storageWrapper.key1 = 'newValue';
+    strictEqual(storageWrapper.getItem('key1'), 'newValue');
+    strictEqual(storageWrapper.length, 1);
+});
+
+test('getter', function () {
+    var storageWrapper = storageSandbox.localStorage;
+
+    storageWrapper.setItem('key1', 'value1');
+    strictEqual(storageWrapper.key1, 'value1');
+
+    storageWrapper.setItem('key1', null);
+    strictEqual(storageWrapper.key1, 'null');
+
+    storageWrapper.setItem(null, null);
+    strictEqual(storageWrapper.null, 'null');
+
+    storageWrapper.removeItem(null);
+    strictEqual(storageWrapper.null, void 0);
+});
+
+module('area of visibility');
+
+asyncTest('iframe with empty src', function () {
+    var topStorage = storageSandbox.localStorage;
+    var iframe     = document.createElement('iframe');
+
+    iframe.id       = 'test001';
+    topStorage.key1 = 'value1';
+
+    window.QUnitGlobals.waitForIframe(iframe)
+        .then(function () {
+            var iframeStorage = iframe.contentWindow['%hammerhead%'].sandbox.storageSandbox.localStorage;
+
+            strictEqual(iframeStorage.key1, 'value1');
+
+            iframeStorage.key2 = 'value2';
+            topStorage.key3    = 'value3';
+
+            strictEqual(topStorage.key2, 'value2');
+            strictEqual(iframeStorage.key3, 'value3');
+
+            $(iframe).remove();
+            start();
+        });
+
+    document.body.appendChild(iframe);
+});
+
+module('sync state with native');
+
+test('storages load their state from native', function () {
+    localStorage[storageWrapperKey]   = '[[ "key1" ],[ "value1" ]]';
+    sessionStorage[storageWrapperKey] = '[[ "key2" ],[ "value2" ]]';
+
+    var localSandboxWrapper   = new StorageWrapper(window, localStorage, storageWrapperKey, hammerhead.sandbox.event.listeners);
+    var sessionSandboxWrapper = new StorageWrapper(window, sessionStorage, storageWrapperKey, hammerhead.sandbox.event.listeners);
+
+    strictEqual(localSandboxWrapper.key1, 'value1');
+    strictEqual(sessionSandboxWrapper.key2, 'value2');
+});
+
+test('storages save their state on the beforeunload event', function () {
+    storageSandbox.localStorage.key1   = 'value1';
+    storageSandbox.sessionStorage.key2 = 'value2';
+
+    ok(!localStorage[storageWrapperKey]);
+    ok(!sessionStorage[storageWrapperKey]);
+
+    // NOTE: Simulate page leaving
+    hammerhead.sandbox.event.unload._emitBeforeUnloadEvent();
+
+    strictEqual(localStorage[storageWrapperKey], JSON.stringify([['key1'], ['value1']]));
+    strictEqual(sessionStorage[storageWrapperKey], JSON.stringify([['key2'], ['value2']]));
+});
+
+module('storage changed event');
+
+asyncTest('event firing in all same host windows', function () {
+    var topStorage    = storageSandbox.localStorage;
+    var iframeStorage = null;
+    var iframe        = document.createElement('iframe');
+
+    var topStorageEventArgs    = [];
+    var iframeStorageEventArgs = [];
+
+    var topWindowHandler = function (e) {
+        topStorageEventArgs.push(e);
+    };
+
+    var iframeWindowHandler = function (e) {
+        iframeStorageEventArgs.push(e);
+    };
+
+    iframe.id = 'test001';
+
+    window.QUnitGlobals.waitForIframe(iframe)
+        .then(function () {
+            iframeStorage = iframe.contentWindow['%hammerhead%'].sandbox.storageSandbox.localStorage;
+
+            window.addEventListener('storage', topWindowHandler);
+            iframe.contentWindow.addEventListener('storage', iframeWindowHandler);
+
+            iframeStorage.key1 = 'value1';
+
+            return waitStorageUpdated();
+        })
+        .then(function () {
+            strictEqual(topStorageEventArgs.length, 1);
+            strictEqual(iframeStorageEventArgs.length, 1);
+
+            strictEqual(topStorageEventArgs[0].key, 'key1');
+            strictEqual(topStorageEventArgs[0].oldValue, isIE ? '' : null);
+            strictEqual(topStorageEventArgs[0].newValue, 'value1');
+            // NOTE: We can't detect who changed the storage.
+            // strictEqual(topStorageEventArgs[0].url, 'https://iframe.example.com');
+            strictEqual(topStorageEventArgs[0].storageArea, iframeStorage);
+
+            strictEqual(iframeStorageEventArgs[0].key, 'key1');
+            strictEqual(iframeStorageEventArgs[0].oldValue, isIE ? '' : null);
+            strictEqual(iframeStorageEventArgs[0].newValue, 'value1');
+            // NOTE: We can't detect who changed the storage.
+            // strictEqual(iframeStorageEventArgs[0].url, 'https://iframe.example.com');
+            strictEqual(iframeStorageEventArgs[0].storageArea, iframeStorage);
+
+            topStorage.key2 = 'value2';
+
+            return waitStorageUpdated();
+        })
+        .then(function () {
+            strictEqual(topStorageEventArgs.length, 2);
+            strictEqual(iframeStorageEventArgs.length, 2);
+
+            strictEqual(topStorageEventArgs[1].key, 'key2');
+            strictEqual(topStorageEventArgs[1].oldValue, isIE ? '' : null);
+            strictEqual(topStorageEventArgs[1].newValue, 'value2');
+            // NOTE: We can't detect who changed the storage.
+            // strictEqual(topStorageEventArgs[1].url, 'https://example.com');
+            strictEqual(topStorageEventArgs[1].storageArea, topStorage);
+
+            strictEqual(iframeStorageEventArgs[1].key, 'key2');
+            strictEqual(iframeStorageEventArgs[1].oldValue, isIE ? '' : null);
+            strictEqual(iframeStorageEventArgs[1].newValue, 'value2');
+            // NOTE: We can't detect who changed the storage.
+            // strictEqual(iframeStorageEventArgs[1].url, 'https://example.com');
+            strictEqual(iframeStorageEventArgs[1].storageArea, topStorage);
+
+            window.removeEventListener('storage', topWindowHandler);
+            $(iframe).remove();
+            start();
+        });
+
+    document.body.appendChild(iframe);
+});
+
+asyncTest('event argument parameters', function () {
+    storageSandbox.localStorage.clear();
+
+    var checkEventArg = function (e, key, oldValue, newValue) {
+        strictEqual(e.key, key);
+        strictEqual(e.oldValue, oldValue);
+        strictEqual(e.newValue, newValue);
+        // NOTE: We can't detect who changed the storage.
+        // strictEqual(e.url, 'https://example.com');
+        strictEqual(e.storageArea, storageSandbox.localStorage);
+    };
+
+    waitStorageUpdated()
+        .then(function () {
+            return waitStorageEvent(window, function () {
+                storageSandbox.localStorage.key1 = 'value1';
+            });
+        })
+        .then(function (e) {
+            checkEventArg(e, 'key1', isIE ? '' : null, 'value1');
+
+            return waitStorageEvent(window, function () {
+                storageSandbox.localStorage.key2 = 'value2';
+            });
+        })
+        .then(function (e) {
+            checkEventArg(e, 'key2', isIE ? '' : null, 'value2');
+
+            return waitStorageEvent(window, function () {
+                storageSandbox.localStorage.key1 = 'value3';
+            });
+        })
+        .then(function (e) {
+            checkEventArg(e, 'key1', 'value1', 'value3');
+
+            return waitStorageEvent(window, function () {
+                storageSandbox.localStorage.removeItem('key1');
+            });
+        })
+        .then(function (e) {
+            checkEventArg(e, 'key1', 'value3', isIE ? 'null' : null);
+
+            start();
+        });
+});
diff --git a/test/playground/upload-storage/.gitkeep b/test/playground/upload-storage/.gitkeep
index d3f5a12fa..8b1378917 100644
--- a/test/playground/upload-storage/.gitkeep
+++ b/test/playground/upload-storage/.gitkeep
@@ -1 +1 @@
-
+