Sotaro KARASAWA 9 лет назад
Родитель
Сommit
f2f54e78e7
2 измененных файлов с 3 добавлено и 0 удалено
  1. 2 0
      lib/crowi/index.js
  2. 1 0
      test/utils.js

+ 2 - 0
lib/crowi/index.js

@@ -143,6 +143,8 @@ Crowi.prototype.event = function(name, event) {
 
 
 Crowi.prototype.setupDatabase = function() {
 Crowi.prototype.setupDatabase = function() {
   // mongoUri = mongodb://user:password@host/dbname
   // mongoUri = mongodb://user:password@host/dbname
+  mongoose.Promise = global.Promise;
+
   var mongoUri = this.env.MONGOLAB_URI || // for B.C.
   var mongoUri = this.env.MONGOLAB_URI || // for B.C.
     this.env.MONGODB_URI || // MONGOLAB changes their env name
     this.env.MONGODB_URI || // MONGOLAB changes their env name
     this.env.MONGOHQ_URL ||
     this.env.MONGOHQ_URL ||

+ 1 - 0
test/utils.js

@@ -7,6 +7,7 @@ var mongoUri = process.env.MONGOLAB_URI || process.env.MONGOHQ_URL || process.en
   , crowi = new (require(ROOT_DIR + '/lib/crowi'))(ROOT_DIR, process.env)
   , crowi = new (require(ROOT_DIR + '/lib/crowi'))(ROOT_DIR, process.env)
   ;
   ;
 
 
+mongoose.Promise = global.Promise;
 
 
 before('Create database connection and clean up', function (done) {
 before('Create database connection and clean up', function (done) {
   if (!mongoUri) {
   if (!mongoUri) {