Bug 1582658 - Enable ESLint for all of devtools/client/storage/test/. r=miker

Differential Revision: https://phabricator.services.mozilla.com/D47679

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Mellina Y. 2019-10-16 13:50:08 +00:00
parent 17530b8dcc
commit 3d366d4c4a
17 changed files with 134 additions and 144 deletions

View file

@ -63,12 +63,6 @@ devtools/client/performance/components/test/test_jit_optimizations_01.html
devtools/client/shared/test/*.html devtools/client/shared/test/*.html
devtools/client/shared/components/test/mochitest/*.html devtools/client/shared/components/test/mochitest/*.html
!devtools/client/shared/components/test/mochitest/test_stack-trace.html !devtools/client/shared/components/test/mochitest/test_stack-trace.html
devtools/client/storage/test/*.html
!devtools/client/storage/test/storage-cookies.html
!devtools/client/storage/test/storage-overflow.html
!devtools/client/storage/test/storage-search.html
!devtools/client/storage/test/storage-unsecured-iframe.html
!devtools/client/storage/test/storage-unsecured-iframe-usercontextid.html
devtools/server/tests/browser/storage-*.html devtools/server/tests/browser/storage-*.html
!devtools/server/tests/browser/storage-unsecured-iframe.html !devtools/server/tests/browser/storage-unsecured-iframe.html
devtools/server/tests/browser/stylesheets-nested-iframes.html devtools/server/tests/browser/stylesheets-nested-iframes.html

View file

@ -10,7 +10,7 @@
// Create an iframe with a javascript: source URL. Such iframes are // Create an iframe with a javascript: source URL. Such iframes are
// considered untrusted by the CacheStorage. // considered untrusted by the CacheStorage.
let frameEl = document.createElement("iframe"); const frameEl = document.createElement("iframe");
document.body.appendChild(frameEl); document.body.appendChild(frameEl);
window.frameContent = 'Hello World'; window.frameContent = 'Hello World';

View file

@ -10,8 +10,8 @@ Bug 970517 - Storage inspector front end - tests
<body> <body>
<script type="application/javascript"> <script type="application/javascript">
"use strict"; "use strict";
let partialHostname = location.hostname.match(/^[^.]+(\..*)$/)[1]; const partialHostname = location.hostname.match(/^[^.]+(\..*)$/)[1];
let cookieExpiresTime = 2000000000000; const cookieExpiresTime = 2000000000000;
// Setting up some cookies to eat. // Setting up some cookies to eat.
document.cookie = "c1=" + JSON.stringify([ document.cookie = "c1=" + JSON.stringify([
"foo", "Bar", { "foo", "Bar", {
@ -38,24 +38,24 @@ sessionStorage.setItem("ss3", "this#is~an#object~foo#bar");
sessionStorage.setItem("ss4", "#array##with#empty#items"); sessionStorage.setItem("ss4", "#array##with#empty#items");
// long string that is almost an object and might trigger exponential // long string that is almost an object and might trigger exponential
// regexp backtracking // regexp backtracking
let s = "a".repeat(1000); const s = "a".repeat(1000);
sessionStorage.setItem("ss5", `${s}=${s}=${s}=${s}&${s}=${s}&${s}`); sessionStorage.setItem("ss5", `${s}=${s}=${s}=${s}&${s}=${s}&${s}`);
console.log("added cookies and stuff from main page"); console.log("added cookies and stuff from main page");
let idbGenerator = async function () { const idbGenerator = async function () {
let request = indexedDB.open("idb1", 1); let request = indexedDB.open("idb1", 1);
request.onerror = function() { request.onerror = function() {
throw new Error("error opening db connection"); throw new Error("error opening db connection");
}; };
let db = await new Promise(done => { const db = await new Promise(done => {
request.onupgradeneeded = event => { request.onupgradeneeded = event => {
let db = event.target.result; const _db = event.target.result;
let store1 = db.createObjectStore("obj1", { keyPath: "id" }); const store1 = _db.createObjectStore("obj1", { keyPath: "id" });
store1.createIndex("name", "name", { unique: false }); store1.createIndex("name", "name", { unique: false });
store1.createIndex("email", "email", { unique: true }); store1.createIndex("email", "email", { unique: true });
db.createObjectStore("obj2", { keyPath: "id2" }); _db.createObjectStore("obj2", { keyPath: "id2" });
store1.transaction.oncomplete = () => { store1.transaction.oncomplete = () => {
done(db); done(_db);
}; };
}; };
}); });
@ -65,9 +65,9 @@ let idbGenerator = async function () {
request.onsuccess = done; request.onsuccess = done;
}); });
let transaction = db.transaction(["obj1", "obj2"], "readwrite"); const transaction = db.transaction(["obj1", "obj2"], "readwrite");
let store1 = transaction.objectStore("obj1"); const store1 = transaction.objectStore("obj1");
let store2 = transaction.objectStore("obj2"); const store2 = transaction.objectStore("obj2");
store1.add({id: 1, name: "foo", email: "foo@bar.com"}); store1.add({id: 1, name: "foo", email: "foo@bar.com"});
store1.add({id: 2, name: "foo2", email: "foo2@bar.com"}); store1.add({id: 2, name: "foo2", email: "foo2@bar.com"});
@ -81,13 +81,13 @@ let idbGenerator = async function () {
db.close(); db.close();
request = indexedDB.open("idb2", 1); request = indexedDB.open("idb2", 1);
let db2 = await new Promise(done => { const db2 = await new Promise(done => {
request.onupgradeneeded = event => { request.onupgradeneeded = event => {
let db2 = event.target.result; const _db2 = event.target.result;
let store3 = db2.createObjectStore("obj3", { keyPath: "id3" }); const store3 = _db2.createObjectStore("obj3", { keyPath: "id3" });
store3.createIndex("name2", "name2", { unique: true }); store3.createIndex("name2", "name2", { unique: true });
store3.transaction.oncomplete = () => { store3.transaction.oncomplete = () => {
done(db2); done(_db2);
}; };
}; };
}); });

View file

@ -7,7 +7,7 @@
<body> <body>
<script type="application/javascript"> <script type="application/javascript">
"use strict"; "use strict";
let expiresIn24Hours = new Date(Date.now() + 60 * 60 * 24 * 1000).toUTCString(); const expiresIn24Hours = new Date(Date.now() + 60 * 60 * 24 * 1000).toUTCString();
document.cookie = "test1=value1;expires=" + expiresIn24Hours + ";"; document.cookie = "test1=value1;expires=" + expiresIn24Hours + ";";
document.cookie = "test2=value2;expires=" + expiresIn24Hours + ";SameSite=lax"; document.cookie = "test2=value2;expires=" + expiresIn24Hours + ";SameSite=lax";

View file

@ -6,50 +6,50 @@
</head> </head>
<body> <body>
<script type="application/javascript"> <script type="application/javascript">
"use strict";
window.setup = async function () { window.setup = async function () {
let request = indexedDB.open("idb1", 1); let request = indexedDB.open("idb1", 1);
let db = await new Promise((resolve, reject) => { const db = await new Promise((resolve, reject) => {
request.onerror = e => reject(Error("error opening db connection")); request.onerror = e => reject(Error("error opening db connection"));
request.onupgradeneeded = event => { request.onupgradeneeded = event => {
let db = event.target.result; const _db = event.target.result;
let store1 = db.createObjectStore("obj1", { keyPath: "id" }); const store1 = _db.createObjectStore("obj1", { keyPath: "id" });
store1.createIndex("name", "name", { unique: false }); store1.createIndex("name", "name", { unique: false });
store1.createIndex("email", "email", { unique: true }); store1.createIndex("email", "email", { unique: true });
let store2 = db.createObjectStore("obj2", { keyPath: "id2" }); _db.createObjectStore("obj2", { keyPath: "id2" });
store1.transaction.oncomplete = () => resolve(db); store1.transaction.oncomplete = () => resolve(_db);
}; };
}); });
await new Promise(resolve => request.onsuccess = resolve); await new Promise(resolve => (request.onsuccess = resolve));
let transaction = db.transaction(["obj1", "obj2"], "readwrite"); const transaction = db.transaction(["obj1", "obj2"], "readwrite");
let store1 = transaction.objectStore("obj1"); const store1 = transaction.objectStore("obj1");
let store2 = transaction.objectStore("obj2"); const store2 = transaction.objectStore("obj2");
store1.add({id: 1, name: "foo", email: "foo@bar.com"}); store1.add({id: 1, name: "foo", email: "foo@bar.com"});
store1.add({id: 2, name: "foo2", email: "foo2@bar.com"}); store1.add({id: 2, name: "foo2", email: "foo2@bar.com"});
store1.add({id: 3, name: "foo2", email: "foo3@bar.com"}); store1.add({id: 3, name: "foo2", email: "foo3@bar.com"});
store2.add({id2: 1, name: "foo", email: "foo@bar.com", extra: "baz"}); store2.add({id2: 1, name: "foo", email: "foo@bar.com", extra: "baz"});
await new Promise(resolve => transaction.oncomplete = resolve); await new Promise(resolve => (transaction.oncomplete = resolve));
db.close(); db.close();
request = indexedDB.open("idb2", 1); request = indexedDB.open("idb2", 1);
let db2 = await new Promise((resolve, reject) => { const db2 = await new Promise((resolve, reject) => {
request.onerror = e => reject(Error("error opening db2 connection")); request.onerror = e => reject(Error("error opening db2 connection"));
request.onupgradeneeded = event => resolve(event.target.result); request.onupgradeneeded = event => resolve(event.target.result);
}); });
await new Promise(resolve => request.onsuccess = resolve); await new Promise(resolve => (request.onsuccess = resolve));
db2.close(); db2.close();
dump("added indexedDB items from main page\n"); dump("added indexedDB items from main page\n");
}; };
window.clear = async function () { window.clear = async function () {
for (let dbName of ["idb1", "idb2"]) { for (const dbName of ["idb1", "idb2"]) {
await new Promise(resolve => { await new Promise(resolve => {
indexedDB.deleteDatabase(dbName).onsuccess = resolve; indexedDB.deleteDatabase(dbName).onsuccess = resolve;
}); });

View file

@ -4,6 +4,8 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>Storage Test</title> <title>Storage Test</title>
<script> <script>
"use strict";
/* exported init */
function init() { function init() {
createIndexedDB(); createIndexedDB();
createCookies(); createCookies();
@ -12,19 +14,17 @@
} }
function createIndexedDB() { function createIndexedDB() {
var open = indexedDB.open("MyDatabase", 1); const open = indexedDB.open("MyDatabase", 1);
open.onupgradeneeded = function () { open.onupgradeneeded = function () {
var db = open.result; const db = open.result;
var store = db.createObjectStore("MyObjectStore", {keyPath: "id"}); db.createObjectStore("MyObjectStore", {keyPath: "id"});
var index = store.createIndex("NameIndex", ["name.last", "name.first"]);
}; };
open.onsuccess = function () { open.onsuccess = function () {
var db = open.result; const db = open.result;
var tx = db.transaction("MyObjectStore", "readwrite"); const tx = db.transaction("MyObjectStore", "readwrite");
var store = tx.objectStore("MyObjectStore"); const store = tx.objectStore("MyObjectStore");
var index = store.index("NameIndex");
store.put({id: 12345, name: {first: "John", last: "Doe"}, age: 42}); store.put({id: 12345, name: {first: "John", last: "Doe"}, age: 42});
store.put({id: 54321, name: {first: "Ralph", last: "Wood"}, age: 38}); store.put({id: 54321, name: {first: "Ralph", last: "Wood"}, age: 38});

View file

@ -6,20 +6,15 @@
</head> </head>
<body> <body>
<script type="application/javascript"> <script type="application/javascript">
"use strict";
let db; let db;
window.setup = async function () { window.setup = async function () {
db = await new Promise((resolve, reject) => { db = await new Promise((resolve, reject) => {
let request = indexedDB.open("idb", 1); const request = indexedDB.open("idb", 1);
request.onsuccess = e => resolve(e.target.result); request.onsuccess = e => resolve(e.target.result);
request.onerror = e => reject(new Error("error opening db connection")); request.onerror = e => reject(new Error("error opening db connection"));
request.onupgradeneeded = e => {
let db = e.target.result;
let store = db.createObjectStore("obj", { keyPath: "id" });
};
}); });
dump("opened indexedDB\n"); dump("opened indexedDB\n");
@ -31,7 +26,7 @@ window.closeDb = function() {
window.deleteDb = async function () { window.deleteDb = async function () {
await new Promise((resolve, reject) => { await new Promise((resolve, reject) => {
let request = indexedDB.deleteDatabase("idb"); const request = indexedDB.deleteDatabase("idb");
request.onsuccess = resolve; request.onsuccess = resolve;
request.onerror = e => reject(new Error("error deleting db")); request.onerror = e => reject(new Error("error deleting db"));
@ -39,7 +34,7 @@ window.deleteDb = async function () {
}; };
window.clear = async function () { window.clear = async function () {
for (let dbName of ["idb1", "idb2"]) { for (const dbName of ["idb1", "idb2"]) {
await new Promise(resolve => { await new Promise(resolve => {
indexedDB.deleteDatabase(dbName).onsuccess = resolve; indexedDB.deleteDatabase(dbName).onsuccess = resolve;
}); });

View file

@ -7,6 +7,7 @@
<script type="application/javascript"> <script type="application/javascript">
"use strict"; "use strict";
/* exported createIndexedDBs */
function createIndexedDBs() { function createIndexedDBs() {
createIndexedDB("idb1", "temporary"); createIndexedDB("idb1", "temporary");
createIndexedDB("idb1", "default"); createIndexedDB("idb1", "default");
@ -17,10 +18,10 @@
} }
function createIndexedDB(name, storage) { function createIndexedDB(name, storage) {
let open = indexedDB.open(name, {storage: storage}); const open = indexedDB.open(name, {storage: storage});
open.onsuccess = function () { open.onsuccess = function () {
let db = open.result; const db = open.result;
db.close(); db.close();
}; };
} }

View file

@ -12,9 +12,9 @@ Storage inspector front end for userContextId - tests
<iframe src="https://sectest1.example.org:443/browser/devtools/client/storage/test/storage-secured-iframe-usercontextid.html"></iframe> <iframe src="https://sectest1.example.org:443/browser/devtools/client/storage/test/storage-secured-iframe-usercontextid.html"></iframe>
<script type="application/javascript"> <script type="application/javascript">
"use strict"; "use strict";
let partialHostname = location.hostname.match(/^[^.]+(\..*)$/)[1]; const partialHostname = location.hostname.match(/^[^.]+(\..*)$/)[1];
let cookieExpiresTime1 = 2000000000000; const cookieExpiresTime1 = 2000000000000;
let cookieExpiresTime2 = 2000000001000; const cookieExpiresTime2 = 2000000001000;
// Setting up some cookies to eat. // Setting up some cookies to eat.
document.cookie = "c1uc1=foobar; expires=" + document.cookie = "c1uc1=foobar; expires=" +
new Date(cookieExpiresTime1).toGMTString() + "; path=/browser"; new Date(cookieExpiresTime1).toGMTString() + "; path=/browser";
@ -28,20 +28,20 @@ localStorage.setItem("ls2uc1", "foobar-2");
sessionStorage.setItem("ss1uc1", "foobar-3"); sessionStorage.setItem("ss1uc1", "foobar-3");
dump("added cookies and storage from main page\n"); dump("added cookies and storage from main page\n");
let idbGenerator = async function () { const idbGenerator = async function () {
let request = indexedDB.open("idb1uc1", 1); let request = indexedDB.open("idb1uc1", 1);
request.onerror = function() { request.onerror = function() {
throw new Error("error opening db connection"); throw new Error("error opening db connection");
}; };
let db = await new Promise(done => { const db = await new Promise(done => {
request.onupgradeneeded = event => { request.onupgradeneeded = event => {
let db = event.target.result; const _db = event.target.result;
let store1 = db.createObjectStore("obj1uc1", { keyPath: "id" }); const store1 = _db.createObjectStore("obj1uc1", { keyPath: "id" });
store1.createIndex("name", "name", { unique: false }); store1.createIndex("name", "name", { unique: false });
store1.createIndex("email", "email", { unique: true }); store1.createIndex("email", "email", { unique: true });
let store2 = db.createObjectStore("obj2uc1", { keyPath: "id2" }); _db.createObjectStore("obj2uc1", { keyPath: "id2" });
store1.transaction.oncomplete = () => { store1.transaction.oncomplete = () => {
done(db); done(_db);
}; };
}; };
}); });
@ -51,9 +51,9 @@ let idbGenerator = async function () {
request.onsuccess = done; request.onsuccess = done;
}); });
let transaction = db.transaction(["obj1uc1", "obj2uc1"], "readwrite"); const transaction = db.transaction(["obj1uc1", "obj2uc1"], "readwrite");
let store1 = transaction.objectStore("obj1uc1"); const store1 = transaction.objectStore("obj1uc1");
let store2 = transaction.objectStore("obj2uc1"); const store2 = transaction.objectStore("obj2uc1");
store1.add({id: 1, name: "foo", email: "foo@bar.com"}); store1.add({id: 1, name: "foo", email: "foo@bar.com"});
store1.add({id: 2, name: "foo2", email: "foo2@bar.com"}); store1.add({id: 2, name: "foo2", email: "foo2@bar.com"});
store1.add({id: 3, name: "foo2", email: "foo3@bar.com"}); store1.add({id: 3, name: "foo2", email: "foo3@bar.com"});
@ -71,13 +71,13 @@ let idbGenerator = async function () {
db.close(); db.close();
request = indexedDB.open("idb2uc1", 1); request = indexedDB.open("idb2uc1", 1);
let db2 = await new Promise(done => { const db2 = await new Promise(done => {
request.onupgradeneeded = event => { request.onupgradeneeded = event => {
let db2 = event.target.result; const _db2 = event.target.result;
let store3 = db2.createObjectStore("obj3uc1", { keyPath: "id3" }); const store3 = _db2.createObjectStore("obj3uc1", { keyPath: "id3" });
store3.createIndex("name2", "name2", { unique: true }); store3.createIndex("name2", "name2", { unique: true });
store3.transaction.oncomplete = () => { store3.transaction.oncomplete = () => {
done(db2); done(_db2);
} }
}; };
}); });
@ -98,12 +98,12 @@ function deleteDB(dbName) {
} }
async function fetchPut(cache, url) { async function fetchPut(cache, url) {
let response = await fetch(url); const response = await fetch(url);
await cache.put(url, response); await cache.put(url, response);
} }
let cacheGenerator = async function () { const cacheGenerator = async function () {
let cache = await caches.open("plopuc1"); const cache = await caches.open("plopuc1");
await fetchPut(cache, "404_cached_file.js"); await fetchPut(cache, "404_cached_file.js");
await fetchPut(cache, "browser_storage_basic.js"); await fetchPut(cache, "browser_storage_basic.js");
}; };

View file

@ -15,9 +15,9 @@ include fragments e.g. http://example.com/test.js#abcdefg
<iframe src="https://sectest1.example.org:443/browser/devtools/client/storage/test/storage-secured-iframe.html#ghi"></iframe> <iframe src="https://sectest1.example.org:443/browser/devtools/client/storage/test/storage-secured-iframe.html#ghi"></iframe>
<script type="application/javascript"> <script type="application/javascript">
"use strict"; "use strict";
let partialHostname = location.hostname.match(/^[^.]+(\..*)$/)[1]; const partialHostname = location.hostname.match(/^[^.]+(\..*)$/)[1];
let cookieExpiresTime1 = 2000000000000; const cookieExpiresTime1 = 2000000000000;
let cookieExpiresTime2 = 2000000001000; const cookieExpiresTime2 = 2000000001000;
// Setting up some cookies to eat. // Setting up some cookies to eat.
document.cookie = "c1=foobar; expires=" + document.cookie = "c1=foobar; expires=" +
new Date(cookieExpiresTime1).toGMTString() + "; path=/browser"; new Date(cookieExpiresTime1).toGMTString() + "; path=/browser";
@ -31,20 +31,20 @@ localStorage.setItem("ls2", "foobar-2");
sessionStorage.setItem("ss1", "foobar-3"); sessionStorage.setItem("ss1", "foobar-3");
dump("added cookies and storage from main page\n"); dump("added cookies and storage from main page\n");
let idbGenerator = async function () { const idbGenerator = async function () {
let request = indexedDB.open("idb1", 1); let request = indexedDB.open("idb1", 1);
request.onerror = function() { request.onerror = function() {
throw new Error("error opening db connection"); throw new Error("error opening db connection");
}; };
let db = await new Promise(done => { const db = await new Promise(done => {
request.onupgradeneeded = event => { request.onupgradeneeded = event => {
let db = event.target.result; const _db = event.target.result;
let store1 = db.createObjectStore("obj1", { keyPath: "id" }); const store1 = _db.createObjectStore("obj1", { keyPath: "id" });
store1.createIndex("name", "name", { unique: false }); store1.createIndex("name", "name", { unique: false });
store1.createIndex("email", "email", { unique: true }); store1.createIndex("email", "email", { unique: true });
let store2 = db.createObjectStore("obj2", { keyPath: "id2" }); _db.createObjectStore("obj2", { keyPath: "id2" }); // eslint-disable-line no-unused-vars
store1.transaction.oncomplete = () => { store1.transaction.oncomplete = () => {
done(db); done(_db);
}; };
}; };
}); });
@ -54,9 +54,9 @@ let idbGenerator = async function () {
request.onsuccess = done; request.onsuccess = done;
}); });
let transaction = db.transaction(["obj1", "obj2"], "readwrite"); const transaction = db.transaction(["obj1", "obj2"], "readwrite");
let store1 = transaction.objectStore("obj1"); const store1 = transaction.objectStore("obj1");
let store2 = transaction.objectStore("obj2"); const store2 = transaction.objectStore("obj2");
store1.add({id: 1, name: "foo", email: "foo@bar.com"}); store1.add({id: 1, name: "foo", email: "foo@bar.com"});
store1.add({id: 2, name: "foo2", email: "foo2@bar.com"}); store1.add({id: 2, name: "foo2", email: "foo2@bar.com"});
store1.add({id: 3, name: "foo2", email: "foo3@bar.com"}); store1.add({id: 3, name: "foo2", email: "foo3@bar.com"});
@ -74,13 +74,13 @@ let idbGenerator = async function () {
db.close(); db.close();
request = indexedDB.open("idb2", 1); request = indexedDB.open("idb2", 1);
let db2 = await new Promise(done => { const db2 = await new Promise(done => {
request.onupgradeneeded = event => { request.onupgradeneeded = event => {
let db2 = event.target.result; const _db2 = event.target.result;
let store3 = db2.createObjectStore("obj3", { keyPath: "id3" }); const store3 = _db2.createObjectStore("obj3", { keyPath: "id3" });
store3.createIndex("name2", "name2", { unique: true }); store3.createIndex("name2", "name2", { unique: true });
store3.transaction.oncomplete = () => { store3.transaction.oncomplete = () => {
done(db2); done(_db2);
} }
}; };
}); });
@ -101,12 +101,12 @@ function deleteDB(dbName) {
} }
async function fetchPut(cache, url) { async function fetchPut(cache, url) {
let response = await fetch(url); const response = await fetch(url);
await cache.put(url, response); await cache.put(url, response);
} }
let cacheGenerator = async function () { const cacheGenerator = async function () {
let cache = await caches.open("plop"); const cache = await caches.open("plop");
await fetchPut(cache, "404_cached_file.js"); await fetchPut(cache, "404_cached_file.js");
await fetchPut(cache, "browser_storage_basic.js"); await fetchPut(cache, "browser_storage_basic.js");
}; };

View file

@ -12,9 +12,9 @@ Storage inspector front end - tests
<iframe src="https://sectest1.example.org:443/browser/devtools/client/storage/test/storage-secured-iframe.html"></iframe> <iframe src="https://sectest1.example.org:443/browser/devtools/client/storage/test/storage-secured-iframe.html"></iframe>
<script type="application/javascript"> <script type="application/javascript">
"use strict"; "use strict";
let partialHostname = location.hostname.match(/^[^.]+(\..*)$/)[1]; const partialHostname = location.hostname.match(/^[^.]+(\..*)$/)[1];
let cookieExpiresTime1 = 2000000000000; const cookieExpiresTime1 = 2000000000000;
let cookieExpiresTime2 = 2000000001000; const cookieExpiresTime2 = 2000000001000;
// Setting up some cookies to eat. // Setting up some cookies to eat.
document.cookie = "c1=foobar; expires=" + document.cookie = "c1=foobar; expires=" +
new Date(cookieExpiresTime1).toGMTString() + "; path=/browser"; new Date(cookieExpiresTime1).toGMTString() + "; path=/browser";
@ -43,20 +43,20 @@ sessionStorage.setItem("key", "value2");
dump("added cookies and storage from main page\n"); dump("added cookies and storage from main page\n");
let idbGenerator = async function () { const idbGenerator = async function () {
let request = indexedDB.open("idb1", 1); let request = indexedDB.open("idb1", 1);
request.onerror = function() { request.onerror = function() {
throw new Error("error opening db connection"); throw new Error("error opening db connection");
}; };
let db = await new Promise(done => { const db = await new Promise(done => {
request.onupgradeneeded = event => { request.onupgradeneeded = event => {
let db = event.target.result; const _db = event.target.result;
let store1 = db.createObjectStore("obj1", { keyPath: "id" }); const store1 = _db.createObjectStore("obj1", { keyPath: "id" });
store1.createIndex("name", "name", { unique: false }); store1.createIndex("name", "name", { unique: false });
store1.createIndex("email", "email", { unique: true }); store1.createIndex("email", "email", { unique: true });
let store2 = db.createObjectStore("obj2", { keyPath: "id2" }); _db.createObjectStore("obj2", { keyPath: "id2" }); // eslint-disable-line no-unused-vars
store1.transaction.oncomplete = () => { store1.transaction.oncomplete = () => {
done(db); done(_db);
}; };
}; };
}); });
@ -66,9 +66,9 @@ let idbGenerator = async function () {
request.onsuccess = done; request.onsuccess = done;
}); });
let transaction = db.transaction(["obj1", "obj2"], "readwrite"); const transaction = db.transaction(["obj1", "obj2"], "readwrite");
let store1 = transaction.objectStore("obj1"); const store1 = transaction.objectStore("obj1");
let store2 = transaction.objectStore("obj2"); const store2 = transaction.objectStore("obj2");
store1.add({id: 1, name: "foo", email: "foo@bar.com"}); store1.add({id: 1, name: "foo", email: "foo@bar.com"});
store1.add({id: 2, name: "foo2", email: "foo2@bar.com"}); store1.add({id: 2, name: "foo2", email: "foo2@bar.com"});
store1.add({id: 3, name: "foo2", email: "foo3@bar.com"}); store1.add({id: 3, name: "foo2", email: "foo3@bar.com"});
@ -86,13 +86,13 @@ let idbGenerator = async function () {
db.close(); db.close();
request = indexedDB.open("idb2", 1); request = indexedDB.open("idb2", 1);
let db2 = await new Promise(done => { const db2 = await new Promise(done => {
request.onupgradeneeded = event => { request.onupgradeneeded = event => {
let db2 = event.target.result; const _db2 = event.target.result;
let store3 = db2.createObjectStore("obj3", { keyPath: "id3" }); const store3 = _db2.createObjectStore("obj3", { keyPath: "id3" });
store3.createIndex("name2", "name2", { unique: true }); store3.createIndex("name2", "name2", { unique: true });
store3.transaction.oncomplete = () => { store3.transaction.oncomplete = () => {
done(db2); done(_db2);
} }
}; };
}); });
@ -113,12 +113,12 @@ function deleteDB(dbName) {
} }
async function fetchPut(cache, url) { async function fetchPut(cache, url) {
let response = await fetch(url); const response = await fetch(url);
await cache.put(url, response); await cache.put(url, response);
} }
let cacheGenerator = async function () { const cacheGenerator = async function () {
let cache = await caches.open("plop"); const cache = await caches.open("plop");
await fetchPut(cache, "404_cached_file.js"); await fetchPut(cache, "404_cached_file.js");
await fetchPut(cache, "browser_storage_basic.js"); await fetchPut(cache, "browser_storage_basic.js");
}; };

View file

@ -8,7 +8,7 @@
<title>Storage inspector localStorage test</title> <title>Storage inspector localStorage test</title>
<script type="application/javascript"> <script type="application/javascript">
"use strict"; "use strict";
/* exported setup */
function setup() { function setup() {
localStorage.setItem("TestLS1", "ValueLS1"); localStorage.setItem("TestLS1", "ValueLS1");
localStorage.setItem("TestLS2", "ValueLS2"); localStorage.setItem("TestLS2", "ValueLS2");

View file

@ -14,17 +14,17 @@ localStorage.setItem("iframe-s-ls1uc1", "foobar");
sessionStorage.setItem("iframe-s-ss1uc1", "foobar-2"); sessionStorage.setItem("iframe-s-ss1uc1", "foobar-2");
dump("added cookies and storage from secured iframe\n"); dump("added cookies and storage from secured iframe\n");
let idbGenerator = async function () { const idbGenerator = async function () {
let request = indexedDB.open("idb-s1uc1", 1); let request = indexedDB.open("idb-s1uc1", 1);
request.onerror = function() { request.onerror = function() {
throw new Error("error opening db connection"); throw new Error("error opening db connection");
}; };
let db = await new Promise(done => { const db = await new Promise(done => {
request.onupgradeneeded = event => { request.onupgradeneeded = event => {
let db = event.target.result; const _db = event.target.result;
let store1 = db.createObjectStore("obj-s1uc1", { keyPath: "id" }); const store1 = _db.createObjectStore("obj-s1uc1", { keyPath: "id" });
store1.transaction.oncomplete = () => { store1.transaction.oncomplete = () => {
done(db); done(_db);
}; };
}; };
}); });
@ -33,7 +33,7 @@ let idbGenerator = async function () {
}); });
let transaction = db.transaction(["obj-s1uc1"], "readwrite"); let transaction = db.transaction(["obj-s1uc1"], "readwrite");
let store1 = transaction.objectStore("obj-s1uc1"); const store1 = transaction.objectStore("obj-s1uc1");
store1.add({id: 6, name: "foo", email: "foo@bar.com"}); store1.add({id: 6, name: "foo", email: "foo@bar.com"});
store1.add({id: 7, name: "foo2", email: "foo2@bar.com"}); store1.add({id: 7, name: "foo2", email: "foo2@bar.com"});
await new Promise(success => { await new Promise(success => {
@ -43,14 +43,14 @@ let idbGenerator = async function () {
db.close(); db.close();
request = indexedDB.open("idb-s2uc1", 1); request = indexedDB.open("idb-s2uc1", 1);
let db2 = await new Promise(done => { const db2 = await new Promise(done => {
request.onupgradeneeded = event => { request.onupgradeneeded = event => {
let db2 = event.target.result; const _db2 = event.target.result;
let store3 = const store3 =
db2.createObjectStore("obj-s2uc1", { keyPath: "id3", autoIncrement: true }); _db2.createObjectStore("obj-s2uc1", { keyPath: "id3", autoIncrement: true });
store3.createIndex("name2", "name2", { unique: true }); store3.createIndex("name2", "name2", { unique: true });
store3.transaction.oncomplete = () => { store3.transaction.oncomplete = () => {
done(db2); done(_db2);
}; };
}; };
}); });
@ -59,7 +59,7 @@ let idbGenerator = async function () {
}); });
transaction = db2.transaction(["obj-s2uc1"], "readwrite"); transaction = db2.transaction(["obj-s2uc1"], "readwrite");
let store3 = transaction.objectStore("obj-s2uc1"); const store3 = transaction.objectStore("obj-s2uc1");
store3.add({id3: 16, name2: "foo", email: "foo@bar.com"}); store3.add({id3: 16, name2: "foo", email: "foo@bar.com"});
await new Promise(success => { await new Promise(success => {
transaction.oncomplete = success; transaction.oncomplete = success;

View file

@ -9,7 +9,7 @@ Iframe for testing multiple host detetion in storage actor
<body> <body>
<script type="application/javascript"> <script type="application/javascript">
"use strict"; "use strict";
let cookieExpiresTime = 2000000000000; const cookieExpiresTime = 2000000000000;
document.cookie = "sc1=foobar;"; document.cookie = "sc1=foobar;";
document.cookie = "sc2=foobar-2; expires=" + document.cookie = "sc2=foobar-2; expires=" +
new Date(cookieExpiresTime).toGMTString() + ";"; new Date(cookieExpiresTime).toGMTString() + ";";
@ -17,17 +17,17 @@ localStorage.setItem("iframe-s-ls1", "foobar");
sessionStorage.setItem("iframe-s-ss1", "foobar-2"); sessionStorage.setItem("iframe-s-ss1", "foobar-2");
dump("added cookies and storage from secured iframe\n"); dump("added cookies and storage from secured iframe\n");
let idbGenerator = async function () { const idbGenerator = async function () {
let request = indexedDB.open("idb-s1", 1); let request = indexedDB.open("idb-s1", 1);
request.onerror = function() { request.onerror = function() {
throw new Error("error opening db connection"); throw new Error("error opening db connection");
}; };
let db = await new Promise(done => { const db = await new Promise(done => {
request.onupgradeneeded = event => { request.onupgradeneeded = event => {
let db = event.target.result; const _db = event.target.result;
let store1 = db.createObjectStore("obj-s1", { keyPath: "id" }); const store1 = _db.createObjectStore("obj-s1", { keyPath: "id" });
store1.transaction.oncomplete = () => { store1.transaction.oncomplete = () => {
done(db); done(_db);
}; };
}; };
}); });
@ -36,7 +36,7 @@ let idbGenerator = async function () {
}); });
let transaction = db.transaction(["obj-s1"], "readwrite"); let transaction = db.transaction(["obj-s1"], "readwrite");
let store1 = transaction.objectStore("obj-s1"); const store1 = transaction.objectStore("obj-s1");
store1.add({id: 6, name: "foo", email: "foo@bar.com"}); store1.add({id: 6, name: "foo", email: "foo@bar.com"});
store1.add({id: 7, name: "foo2", email: "foo2@bar.com"}); store1.add({id: 7, name: "foo2", email: "foo2@bar.com"});
await new Promise(success => { await new Promise(success => {
@ -46,14 +46,14 @@ let idbGenerator = async function () {
db.close(); db.close();
request = indexedDB.open("idb-s2", 1); request = indexedDB.open("idb-s2", 1);
let db2 = await new Promise(done => { const db2 = await new Promise(done => {
request.onupgradeneeded = event => { request.onupgradeneeded = event => {
let db2 = event.target.result; const _db2 = event.target.result;
let store3 = const store3 =
db2.createObjectStore("obj-s2", { keyPath: "id3", autoIncrement: true }); _db2.createObjectStore("obj-s2", { keyPath: "id3", autoIncrement: true });
store3.createIndex("name2", "name2", { unique: true }); store3.createIndex("name2", "name2", { unique: true });
store3.transaction.oncomplete = () => { store3.transaction.oncomplete = () => {
done(db2); done(_db2);
}; };
}; };
}); });
@ -62,7 +62,7 @@ let idbGenerator = async function () {
}); });
transaction = db2.transaction(["obj-s2"], "readwrite"); transaction = db2.transaction(["obj-s2"], "readwrite");
let store3 = transaction.objectStore("obj-s2"); const store3 = transaction.objectStore("obj-s2");
store3.add({id3: 16, name2: "foo", email: "foo@bar.com"}); store3.add({id3: 16, name2: "foo", email: "foo@bar.com"});
await new Promise(success => { await new Promise(success => {
transaction.oncomplete = success; transaction.oncomplete = success;

View file

@ -8,7 +8,7 @@
<title>Storage inspector sessionStorage test</title> <title>Storage inspector sessionStorage test</title>
<script type="application/javascript"> <script type="application/javascript">
"use strict"; "use strict";
/* exported setup */
function setup() { function setup() {
sessionStorage.setItem("TestSS1", "ValueSS1"); sessionStorage.setItem("TestSS1", "ValueSS1");
sessionStorage.setItem("TestSS2", "ValueSS2"); sessionStorage.setItem("TestSS2", "ValueSS2");

View file

@ -5,7 +5,7 @@
<title>Storage inspector sidebar parsetree test</title> <title>Storage inspector sidebar parsetree test</title>
<script type="application/javascript"> <script type="application/javascript">
"use strict"; "use strict";
/* exported setup */
function setup() { function setup() {
// These values should not be parsed into a tree. // These values should not be parsed into a tree.
localStorage.setItem("base64", "aGVsbG93b3JsZA=="); localStorage.setItem("base64", "aGVsbG93b3JsZA==");

View file

@ -46,8 +46,8 @@ window.clear = function() {
}; };
window.onload = function() { window.onload = function() {
addCookie("c1", "1.2.3.4.5.6.7", "/browser"); window.addCookie("c1", "1.2.3.4.5.6.7", "/browser");
addCookie("c2", "foobar", "/browser"); window.addCookie("c2", "foobar", "/browser");
// Some keys have to be set to strings that JSON.parse can parse successfully // Some keys have to be set to strings that JSON.parse can parse successfully
// instead of throwings (to verify the issue fixed by Bug 1578447 doesn't regress). // instead of throwings (to verify the issue fixed by Bug 1578447 doesn't regress).