Fix tests for new application structure

test/bootstrap.js

@@ -3,6 +3,7 @@
 var express = require('express')
   , async = require('async')
   , mongoose= require('mongoose')
+  , ROOT_DIR = __dirname + '/..'
   , MODEL_DIR = __dirname + '/../lib/models'
   , mongoUri
   , testDBUtil
@@ -39,5 +40,6 @@ testDBUtil = {
 global.express = express;
 global.mongoose = mongoose;
 global.mongoUri = mongoUri;
+global.ROOT_DIR = ROOT_DIR;
 global.MODEL_DIR = MODEL_DIR;
 global.testDBUtil = testDBUtil;

test/models/config.test.js

@@ -8,8 +8,8 @@ chai.use(sinonChai);
 
 describe('Config model test', function () {
   var conn
-    , app = new express()
-    , Config = proxyquire(MODEL_DIR + '/config.js', {mongoose: mongoose})(app)
+    , crowi = new (require(ROOT_DIR + '/lib/crowi'))(ROOT_DIR, process.env)
+    , Config = proxyquire(MODEL_DIR + '/config.js', {mongoose: mongoose})(crowi)
     ;
 
   before(function (done) {

test/models/page.test.js

@@ -8,10 +8,9 @@ chai.use(sinonChai);
 
 describe('Page', function () {
   var conn
-    , app = new express()
-    , models = proxyquire(MODEL_DIR, {mongoose: mongoose})(app)
-    , Page = proxyquire(MODEL_DIR + '/page.js', {mongoose: mongoose})(app, models)
-    , User = proxyquire(MODEL_DIR + '/user.js', {mongoose: mongoose})(app, models)
+    , crowi = new (require(ROOT_DIR + '/lib/crowi'))(ROOT_DIR, process.env)
+    , Page = proxyquire(MODEL_DIR + '/page.js', {mongoose: mongoose})(crowi)
+    , User = proxyquire(MODEL_DIR + '/user.js', {mongoose: mongoose})(crowi)
     ;
 
   if (!mongoUri) {