Merge branch 'master' into 0.7.0

v1.18.x
Julian Lam 10 years ago
commit c8c7081f5d

@ -920,6 +920,12 @@ var async = require('async'),
}); });
break; break;
case 'date':
groups = groups.sort(function(a, b) {
return a.createtime < b.createtime;
});
break;
case 'alpha': // intentional fall-through case 'alpha': // intentional fall-through
default: default:
groups = groups.sort(function(a, b) { groups = groups.sort(function(a, b) {

@ -390,7 +390,7 @@ describe('Sorted Set methods', function() {
describe('getSortedSetsMembers', function() { describe('getSortedSetsMembers', function() {
it('should return members of multiple sorted sets', function(done) { it('should return members of multiple sorted sets', function(done) {
db.getSortedSetMembers(['doesnotexist', 'sortedSetTest1'], function(err, sortedSets) { db.getSortedSetsMembers(['doesnotexist', 'sortedSetTest1'], function(err, sortedSets) {
assert.equal(err, null); assert.equal(err, null);
assert.equal(arguments.length, 2); assert.equal(arguments.length, 2);
assert.deepEqual(sortedSets[0], []); assert.deepEqual(sortedSets[0], []);

Loading…
Cancel
Save