1 files changed, 14 insertions, 22 deletions
diff --git a/packages/idb-bridge/src/idb-wpt-ported/wptsupport.ts b/packages/idb-bridge/src/idb-wpt-ported/wptsupport.ts
index 38b44bbec..c648bf53f 100644
--- a/packages/idb-bridge/src/idb-wpt-ported/wptsupport.ts
+++ b/packages/idb-bridge/src/idb-wpt-ported/wptsupport.ts
@@ -1,5 +1,5 @@
-import test, { ExecutionContext } from "ava";
-import { BridgeIDBFactory, BridgeIDBRequest } from "..";
+import { ExecutionContext } from "ava";
+import { BridgeIDBRequest } from "../bridge-idb.js";
 import {
   IDBDatabase,
   IDBIndex,
@@ -7,19 +7,11 @@ import {
   IDBOpenDBRequest,
   IDBRequest,
   IDBTransaction,
-  IDBTransactionMode,
-} from "../idbtypes";
-import { MemoryBackend } from "../MemoryBackend";
-import { compareKeys } from "../util/cmp";
-
-BridgeIDBFactory.enableTracing = true;
-const backend = new MemoryBackend();
-backend.enableTracing = true;
-export const idbFactory = new BridgeIDBFactory(backend);
-
-const self = {
-  indexedDB: idbFactory,
-};
+} from "../idbtypes.js";
+import { initTestIndexedDB , useTestIndexedDb } from "../testingdb.js";
+import { compareKeys } from "../util/cmp.js";
+
+export { initTestIndexedDB, useTestIndexedDb } from "../testingdb.js"
 
 export function createdb(
   t: ExecutionContext<unknown>,
@@ -28,8 +20,8 @@ export function createdb(
 ): IDBOpenDBRequest {
   var rq_open: IDBOpenDBRequest;
   dbname = dbname ? dbname : "testdb-" + new Date().getTime() + Math.random();
-  if (version) rq_open = self.indexedDB.open(dbname, version);
-  else rq_open = self.indexedDB.open(dbname);
+  if (version) rq_open = useTestIndexedDb().open(dbname, version);
+  else rq_open = useTestIndexedDb().open(dbname);
   return rq_open;
 }
 
@@ -112,7 +104,7 @@ export async function migrateNamedDatabase(
   migrationCallback: MigrationCallback,
 ): Promise<IDBDatabase> {
   return new Promise<IDBDatabase>((resolve, reject) => {
-    const request = self.indexedDB.open(databaseName, newVersion);
+    const request = useTestIndexedDb().open(databaseName, newVersion);
     request.onupgradeneeded = (event: any) => {
       const database = event.target.result;
       const transaction = event.target.transaction;
@@ -176,7 +168,7 @@ export async function createDatabase(
   setupCallback: MigrationCallback,
 ): Promise<IDBDatabase> {
   const databaseName = makeDatabaseName(t.title);
-  const request = self.indexedDB.deleteDatabase(databaseName);
+  const request = useTestIndexedDb().deleteDatabase(databaseName);
   return migrateNamedDatabase(t, databaseName, 1, setupCallback);
 }
 
@@ -464,9 +456,9 @@ export function indexeddb_test(
     options = Object.assign({ upgrade_will_abort: false }, options);
     const dbname =
       "testdb-" + new Date().getTime() + Math.random() + (dbsuffix ?? "");
-    var del = self.indexedDB.deleteDatabase(dbname);
+    var del = useTestIndexedDb().deleteDatabase(dbname);
     del.onerror = () => t.fail("deleteDatabase should succeed");
-    var open = self.indexedDB.open(dbname, 1);
+    var open = useTestIndexedDb().open(dbname, 1);
     open.onupgradeneeded = function () {
       var db = open.result;
       t.teardown(function () {
@@ -475,7 +467,7 @@ export function indexeddb_test(
           e.preventDefault();
         };
         db.close();
-        self.indexedDB.deleteDatabase(db.name);
+        useTestIndexedDb().deleteDatabase(db.name);
       });
       var tx = open.transaction!;
       upgrade_func(resolve, db, tx, open);