Use new fixtures helper to clean db

spirit-io · Dec 24, 2016 · bf529d1 · bf529d1
1 parent 1494fa3
commit bf529d1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/src/lib/connector.ts b/src/lib/connector.ts
@@ -43,6 +43,10 @@ export class MongodbConnector implements IConnector {
         return c;
     }
 
+    cleanDb(ds: string): void {
+        this.getConnection(ds).dropDatabase();
+    }
+
     createModelFactory(name: string, myClass: any): IModelFactory {
         return new ModelFactory(name, myClass, this);
     }

diff --git a/src/test/fixtures/index.ts b/src/test/fixtures/index.ts
@@ -1,4 +1,5 @@
 import { Server } from 'spirit.io/lib/application';
+import { ConnectorHelper } from 'spirit.io/lib/core';
 import { MongodbConnector } from '../../lib/connector';
 import { context, run } from 'f-promise';
 import { setup } from 'f-mocha';
@@ -33,15 +34,7 @@ export class Fixtures extends GlobalFixtures {
         let connector;
         if (!context().__server) {
             let server: Server = context().__server = new Server(config);
-            run(() => {
-                console.log("\n========== Initialize server begins ============");
-                connector = new MongodbConnector(config.connectors.mongodb);
-                server.addConnector(connector);
-                console.log("Connector config: " + JSON.stringify(connector.config, null, 2));
-                server.init();
-            }).catch(err => {
-                done(err);
-            });
+
             server.on('initialized', function () {
                 run(() => {
                     console.log("========== Server initialized ============\n");
@@ -50,6 +43,7 @@ export class Fixtures extends GlobalFixtures {
                     done(err);
                 });
             });
+
             server.on('started', function () {
                 run(() => {
                     console.log("========== Server started ============\n");
@@ -61,11 +55,22 @@ export class Fixtures extends GlobalFixtures {
                 });
             });
 
+            run(() => {
+                console.log("\n========== Initialize server begins ============");
+                connector = new MongodbConnector(config.connectors.mongodb);
+                server.addConnector(connector);
+                console.log("Connector config: " + JSON.stringify(connector.config, null, 2));
+                server.init();
+            }).catch(err => {
+                done(err);
+            });
         } else {
             firstSetup = false;
         }
         //
-
+        // delete the whole database
+        let mConnector: MongodbConnector = <MongodbConnector>ConnectorHelper.getConnector('mongodb');
+        Fixtures.cleanDatabases([mConnector]);
         //
         if (!firstSetup) done();
         return context().__server;

diff --git a/src/test/orm.spec.ts b/src/test/orm.spec.ts
@@ -39,10 +39,6 @@ describe('Spirit.io ORM Framework Tests:', () => {
         server = Fixtures.setup(done);
     });
 
-    it('Delete instances should work as expected', () => {
-        removaAllDocuments();
-    });
-
     it('Instanciate class should work either with adminHelper or ModelBase methods', () => {
         // this test does not validate populate as it is not the purpose !