refactor: storage tests (#28)

LokiJS-Forge · Sep 27, 2017 · 2ab7a1e · 2ab7a1e
1 parent ed939af
commit 2ab7a1e
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 51 deletions.
diff --git a/...s/fs-storage/spec/node/fs-adapter.spec.js → packages/fs-storage/spec/node/fs_storage.js b/...s/fs-storage/spec/node/fs-adapter.spec.js → packages/fs-storage/spec/node/fs_storage.js
@@ -2,35 +2,34 @@
 import {Loki} from "../../../loki/src/loki";
 import {LokiFSStorage} from "../../src/fs_storage";
 
-describe("testing persistence adapter", function () {
+describe("testing fs storage", function () {
   it("LokiFSStorage", function (done) {
     const db = new Loki("myTestApp");
 
     const adapter = {adapter: new LokiFSStorage()};
     db.initializePersistence(adapter)
       .then(() => {
         db.addCollection("myColl").insert({name: "Hello World"});
-        return db.saveDatabase().then(() => {
-          const db2 = new Loki("myTestApp");
-          return db2.initializePersistence(adapter)
-            .then(() => {
-              return db2.loadDatabase()
-                .then(() => {
-                  expect(db2.getCollection("myColl").find()[0].name).toEqual("Hello World");
-                });
-            });
-        });
+        return db.saveDatabase();
+      })
+      .then(() => {
+        const db2 = new Loki("myTestApp");
+        return db2.initializePersistence(adapter)
+          .then(() => {
+            return db2.loadDatabase();
+          }).then(() => {
+            expect(db2.getCollection("myColl").find()[0].name).toEqual("Hello World");
+          });
       })
       .then(() => {
         const db3 = new Loki("other");
         return db3.initializePersistence(adapter)
           .then(() => {
-            return db3.loadDatabase()
-              .then(() => {
-                expect(false).toEqual(true);
-              }, () => {
-                expect(true).toEqual(true);
-              });
+            return db3.loadDatabase();
+          }).then(() => {
+            expect(false).toEqual(true);
+          }, () => {
+            expect(true).toEqual(true);
           });
       })
       .then(() => {

diff --git a/packages/indexed-storage/spec/web/indexed_storage.spec.js b/packages/indexed-storage/spec/web/indexed_storage.spec.js
@@ -2,7 +2,7 @@
 import {Loki} from "../../../loki/src/loki";
 import {LokiIndexedStorage} from "../../src/indexed_storage";
 
-describe("testing persistence adapter", function () {
+describe("testing indexed storage", function () {
   it("LokiIndexedStorage", function (done) {
     const db = new Loki("myTestApp");
 
@@ -11,27 +11,26 @@ describe("testing persistence adapter", function () {
     db.initializePersistence(adapter)
       .then(() => {
         db.addCollection("myColl").insert({name: "Hello World"});
-        return db.saveDatabase().then(() => {
-          const db2 = new Loki("myTestApp");
-          return db2.initializePersistence(adapter)
-            .then(() => {
-              return db2.loadDatabase()
-                .then(() => {
-                  expect(db2.getCollection("myColl").find()[0].name).toEqual("Hello World");
-                });
-            });
-        });
+        return db.saveDatabase();
+      })
+      .then(() => {
+        const db2 = new Loki("myTestApp");
+        return db2.initializePersistence(adapter)
+          .then(() => {
+            return db2.loadDatabase();
+          }).then(() => {
+            expect(db2.getCollection("myColl").find()[0].name).toEqual("Hello World");
+          });
       })
       .then(() => {
         const db3 = new Loki("other");
         return db3.initializePersistence(adapter)
           .then(() => {
-            return db3.loadDatabase()
-              .then(() => {
-                expect(false).toEqual(true);
-              }, () => {
-                expect(true).toEqual(true);
-              });
+            return db3.loadDatabase();
+          }).then(() => {
+            expect(false).toEqual(true);
+          }, () => {
+            expect(true).toEqual(true);
           });
       })
       .then(() => {

diff --git a/packages/indexed-storage/src/indexed_storage.js b/packages/indexed-storage/src/indexed_storage.js
@@ -8,6 +8,8 @@ import {Loki} from "../../loki/src/loki";
  adapter.saveDatabase("UserDatabase", JSON.stringify(myDb));
  adapter.loadDatabase("UserDatabase"); // will log the serialized db to console
  adapter.deleteDatabase("UserDatabase");
+
+ Should usercallback be still used?
  */
 
 /**

diff --git a/packages/local-storage/spec/web/local_storage.spec.js b/packages/local-storage/spec/web/local_storage.spec.js
@@ -2,7 +2,7 @@
 import {Loki} from "../../../loki/src/loki";
 import {LokiLocalStorage} from "../../src/local_storage";
 
-describe("testing persistence adapter", function () {
+describe("testing local storage", function () {
   it("LokiLocalStorage", function (done) {
     const db = new Loki("myTestApp");
 
@@ -11,27 +11,26 @@ describe("testing persistence adapter", function () {
     db.initializePersistence(adapter)
       .then(() => {
         db.addCollection("myColl").insert({name: "Hello World"});
-        return db.saveDatabase().then(() => {
-          const db2 = new Loki("myTestApp");
-          return db2.initializePersistence(adapter)
-            .then(() => {
-              return db2.loadDatabase()
-                .then(() => {
-                  expect(db2.getCollection("myColl").find()[0].name).toEqual("Hello World");
-                });
-            });
-        });
+        return db.saveDatabase();
+      })
+      .then(() => {
+        const db2 = new Loki("myTestApp");
+        return db2.initializePersistence(adapter)
+          .then(() => {
+            return db2.loadDatabase();
+          }).then(() => {
+            expect(db2.getCollection("myColl").find()[0].name).toEqual("Hello World");
+          });
       })
       .then(() => {
         const db3 = new Loki("other");
         return db3.initializePersistence(adapter)
           .then(() => {
-            return db3.loadDatabase()
-              .then(() => {
-                expect(false).toEqual(true);
-              }, () => {
-                expect(true).toEqual(true);
-              });
+            return db3.loadDatabase();
+          }).then(() => {
+            expect(false).toEqual(true);
+          }, () => {
+            expect(true).toEqual(true);
           });
       })
       .then(() => {