From 11a2f986cd13da31aa68cb98f8dcbadcd49f4b0a Mon Sep 17 00:00:00 2001 From: welefen Date: Wed, 30 Jul 2014 23:18:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/Lib/Core/Model.js | 10 +++++----- test/Lib/Core/Model_Db.js | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/Lib/Core/Model.js b/test/Lib/Core/Model.js index 4f6607a4..fe1f5d18 100644 --- a/test/Lib/Core/Model.js +++ b/test/Lib/Core/Model.js @@ -18,7 +18,7 @@ var clearRequireCache = function(){ } } -beforeEach(function(){ +before(function(){ muk(MysqlSocket.prototype, 'query', function(sql){ if (sql === 'SHOW COLUMNS FROM `meinv_friend`') { var data = [ @@ -427,13 +427,13 @@ describe('Model', function(){ it('table', function(){ var model = D('tag'); model.table('welefen'); - assert.equal(model._options.table, 'welefen'); + assert.equal(model._options.table, 'meinv_welefen'); }) it('table with prefix', function(){ C('db_prefix', 'meinv_') var model = D('tag'); model.table('welefen', true); - assert.equal(model._options.table, 'meinv_welefen'); + assert.equal(model._options.table, 'welefen'); }) it('table return value', function(){ var model = D('Tag'); @@ -523,7 +523,7 @@ describe('Model', function(){ it('table', function(done){ D('Tag').table('welefen').parseOptions().then(function(options){ //console.log(options) - assert.deepEqual(options, { table: 'welefen', tablePrefix: 'meinv_', model: 'Tag' }) + assert.deepEqual(options, { table: 'meinv_welefen', tablePrefix: 'meinv_', model: 'Tag' }) done(); }) }) @@ -1461,6 +1461,6 @@ describe('Model', function(){ }); -afterEach(function(){ +after(function(){ muk.restore(); }) \ No newline at end of file diff --git a/test/Lib/Core/Model_Db.js b/test/Lib/Core/Model_Db.js index be12fd31..982715d2 100644 --- a/test/Lib/Core/Model_Db.js +++ b/test/Lib/Core/Model_Db.js @@ -39,7 +39,7 @@ beforeEach(function(){ }) }); -describe('Model', function(){ +describe('Model_Db', function(){ C('db_prefix', 'meinv_'); var model = D('Group');