test(Model): reworked model.js test

lib/model.js

@@ -549,7 +549,7 @@ Model.prototype.hasAndBelongsToMany = function(joinedModel, fieldDoc, leftKey, r
 
   var linkModel;
   if (thinky.models[link] === undefined) {
-    linkModel = thinky.createModel(link, {}); // Create a model, claim the namespace and create the table
+    linkModel = thinky.createModel(link, {}, options); // Create a model, claim the namespace and create the table
   }
   else {
     linkModel = thinky.models[link];

package.json

@@ -29,6 +29,8 @@
     "validator": "~ 3.22.1"
   },
   "devDependencies": {
-    "mocha": "~1.21.5"
+    "mocha": "^2.2.5",
+    "chai": "^3.2.0",
+    "chai-as-promised": "^5.1.0"
   }
 }

test/model.js

@@ -356,16 +356,11 @@ describe("Joins", function() {
 
 
     model.hasAndBelongsToMany(otherModel, "otherDoc", "id", "otherId", {init: false});
-    try{
-      model.hasAndBelongsToMany(anotherModel, "otherDoc", "id", "otherId");
-    }
-    catch(err) {
-      assert.equal(err.message, "The field `otherDoc` is already used by another relation.")
-      // Wait for the link table to be ready since we wont' drop/recreate the table
-      thinky.models[model._getModel()._joins["otherDoc"].link].once('ready', function() {
-        // TODO Remove when tableWait is implemented on the server
-        done();
-      })
+    try {
+      model.hasAndBelongsToMany(anotherModel, "otherDoc", "id", "otherId", {init: false});
+    } catch(err) {
+      assert.equal(err.message, "The field `otherDoc` is already used by another relation.");
+      done();
     }
   });
   it('hasOne should throw if the first argument is not a model', function(done) {