update: fix bug

Kenshinhu · Apr 30, 2015 · cd32ec9 · cd32ec9
1 parent 1649bff
commit cd32ec9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/lib/QueryHelper.js b/lib/QueryHelper.js
@@ -6,6 +6,7 @@ var Promise = require('promise/domains');
 
 var m = require('mongoose');
 
+
 function QueryHelper(modelName,mongoose){
 
     this._db = (mongoose === require('mongoose')) ? mongoose : m;
@@ -59,24 +60,24 @@ QueryHelper.prototype = {
 
         //var query = Promise.denodeify(function())
 
-        Promise.all([function(){
-
-                var q = _.model.find(conditions)
-                    .skip(start)
-                    .limit(limit);
+        var promise = new Promise(function (resolve, reject) {
 
-                if(_._sort.length >0){
-                    q.sort(_._sort.join(' '));
-                }
+            var q = _.model.find(conditions)
+                .skip(start)
+                .limit(limit);
 
-                _populate(q).exec(function(err,result){
+            if(_._sort.length >0){
+                q.sort(_._sort.join(' '));
+            }
 
-                    Promise.resolve(result);
-                });
+            _populate(q).exec(function(err,result){
+                resolve(result);
+            });
 
-        }]).then(function(resolve){
+        });
 
-            var data =resolve;
+        promise.then(function(res){
+            var data =res;
 
             _.model.find(conditions).count(function(err,total){
 

diff --git a/test/QueryHelper.test.js b/test/QueryHelper.test.js
@@ -95,8 +95,7 @@ describe(__filename, function () {
             .sort('ip_address')
             .limit(1,10)
             .pagination(function(err,data,total,totalPage,currentPageIndex){
-                console.log(arguments);
-                data.length.should.be.above(0);
+                data.length.should.be.above(1);
                 total.should.be.above(0);
                 totalPage.should.be.above(0);
                 currentPageIndex.should.be.above(0);