File tree Expand file tree Collapse file tree 3 files changed +10
-14
lines changed Expand file tree Collapse file tree 3 files changed +10
-14
lines changed Original file line number Diff line number Diff line change 13
13
"angular-mocks" : " ^1.4.0" ,
14
14
"angular-ui-router" : " ^0.2.15" ,
15
15
"babel" : " ^5.0.12" ,
16
+ "bluebird" : " ^2.9.34" ,
16
17
"body-parser" : " ^1.12.0" ,
17
18
"bootstrap" : " ^3.3.4" ,
18
19
"chai" : " ^2.1.0" ,
51
52
"passport-google-oauth" : " ^0.1.5" ,
52
53
"passport-local" : " ^1.0.0" ,
53
54
"passport-twitter" : " ^1.0.2" ,
54
- "q" : " ^1.2.0" ,
55
55
"run-sequence" : " ^1.0.2" ,
56
56
"serve-favicon" : " ^2.2.0" ,
57
57
"sinon" : " ^1.13.0" ,
Original file line number Diff line number Diff line change @@ -20,14 +20,10 @@ Refer to the q documentation for why and how q.invoke is used.
20
20
*/
21
21
22
22
var mongoose = require ( 'mongoose' ) ;
23
- var connectToDb = require ( './server/db' ) ;
24
- var User = mongoose . model ( 'User' ) ;
25
- var q = require ( 'q' ) ;
23
+ var Promise = require ( 'bluebird' ) ;
26
24
var chalk = require ( 'chalk' ) ;
27
-
28
- var getCurrentUserData = function ( ) {
29
- return q . ninvoke ( User , 'find' , { } ) ;
30
- } ;
25
+ var User = Promise . promisifyAll ( mongoose . model ( 'User' ) ) ;
26
+ var connectToDb = require ( './server/db' ) ;
31
27
32
28
var seedUsers = function ( ) {
33
29
@@ -42,12 +38,12 @@ var seedUsers = function () {
42
38
}
43
39
] ;
44
40
45
- return q . invoke ( User , 'create' , users ) ;
41
+ return User . createAsync ( users ) ;
46
42
47
43
} ;
48
44
49
45
connectToDb . then ( function ( ) {
50
- getCurrentUserData ( ) . then ( function ( users ) {
46
+ User . findAsync ( { } ) . then ( function ( users ) {
51
47
if ( users . length === 0 ) {
52
48
return seedUsers ( ) ;
53
49
} else {
@@ -61,4 +57,4 @@ connectToDb.then(function () {
61
57
console . error ( err ) ;
62
58
process . kill ( 1 ) ;
63
59
} ) ;
64
- } ) ;
60
+ } ) ;
Original file line number Diff line number Diff line change 1
1
'use strict' ;
2
- var Q = require ( 'q ' ) ;
2
+ var Promise = require ( 'bluebird ' ) ;
3
3
var path = require ( 'path' ) ;
4
4
var chalk = require ( 'chalk' ) ;
5
5
@@ -13,7 +13,7 @@ var db = mongoose.connect(DATABASE_URI).connection;
13
13
// anywhere the User model needs to be used.
14
14
require ( './models' ) ;
15
15
16
- var startDbPromise = new Q ( function ( resolve , reject ) {
16
+ var startDbPromise = new Promise ( function ( resolve , reject ) {
17
17
db . on ( 'open' , resolve ) ;
18
18
db . on ( 'error' , reject ) ;
19
19
} ) ;
@@ -23,4 +23,4 @@ startDbPromise.then(function () {
23
23
console . log ( chalk . green ( 'MongoDB connection opened!' ) ) ;
24
24
} ) ;
25
25
26
- module . exports = startDbPromise ;
26
+ module . exports = startDbPromise ;
You can’t perform that action at this time.
0 commit comments