Skip to content

Commit 60342cf

Browse files
Awk34Awk34
committed
refactor(server,e2e,endpoint): remove bluebird promisification of mongoose
1 parent 3b6a377 commit 60342cf

18 files changed

+62
-71
lines changed

Diff for: ‎app/templates/e2e/account(auth)/login/login.spec(jasmine).js

+4-5
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,19 @@ describe('Login View', function() {
1919
};
2020

2121
beforeEach(function(done) {
22-
<% if (filters.mongooseModels) { %>UserModel.removeAsync()<% }
22+
<% if (filters.mongooseModels) { %>UserModel.remove()<% }
2323
if (filters.sequelizeModels) { %>UserModel.destroy({ where: {} })<% } %>
2424
.then(function() {
25-
<% if (filters.mongooseModels) { %>return UserModel.createAsync(testUser);<% }
26-
if (filters.sequelizeModels) { %>return UserModel.create(testUser);<% } %>
25+
return UserModel.create(testUser)
26+
.then(loadPage);
2727
})
28-
.then(loadPage)
28+
// .then(loadPage)
2929
.finally(function() {
3030
browser.wait(function() {
3131
//console.log('waiting for angular...');
3232
return browser.executeScript('return !!window.angular');
3333

3434
}, 5000).then(done);
35-
3635
});
3736
});
3837

Diff for: ‎app/templates/e2e/account(auth)/login/login.spec(mocha).js

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ describe('Login View', function() {
2121

2222
before(function() {
2323
return UserModel
24-
<% if (filters.mongooseModels) { %>.removeAsync()<% }
24+
<% if (filters.mongooseModels) { %>.remove()<% }
2525
if (filters.sequelizeModels) { %>.destroy({ where: {} })<% } %>
2626
.then(function() {
27-
<% if (filters.mongooseModels) { %>return UserModel.createAsync(testUser);<% }
27+
<% if (filters.mongooseModels) { %>return UserModel.create(testUser);<% }
2828
if (filters.sequelizeModels) { %>return UserModel.create(testUser);<% } %>
2929
})
3030
.then(loadPage);
3131
});
3232

3333
after(function() {
34-
<% if (filters.mongooseModels) { %>return UserModel.removeAsync();<% }
34+
<% if (filters.mongooseModels) { %>return UserModel.remove();<% }
3535
if (filters.sequelizeModels) { %>return UserModel.destroy({ where: {} });<% } %>
3636
});
3737

Diff for: ‎app/templates/e2e/account(auth)/logout/logout.spec(jasmine).js

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ describe('Logout View', function() {
1717
};
1818

1919
beforeEach(function(done) {
20-
<% if (filters.mongooseModels) { %>UserModel.removeAsync()<% }
20+
<% if (filters.mongooseModels) { %>UserModel.remove()<% }
2121
if (filters.sequelizeModels) { %>UserModel.destroy({ where: {} })<% } %>
2222
.then(function() {
23-
<% if (filters.mongooseModels) { %>return UserModel.createAsync(testUser);<% }
23+
<% if (filters.mongooseModels) { %>return UserModel.create(testUser);<% }
2424
if (filters.sequelizeModels) { %>return UserModel.create(testUser);<% } %>
2525
})
2626
.then(function() {

Diff for: ‎app/templates/e2e/account(auth)/logout/logout.spec(mocha).js

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ describe('Logout View', function() {
1919

2020
beforeEach(function() {
2121
return UserModel
22-
<% if (filters.mongooseModels) { %>.removeAsync()<% }
22+
<% if (filters.mongooseModels) { %>.remove()<% }
2323
if (filters.sequelizeModels) { %>.destroy({ where: {} })<% } %>
2424
.then(function() {
25-
<% if (filters.mongooseModels) { %>return UserModel.createAsync(testUser);<% }
25+
<% if (filters.mongooseModels) { %>return UserModel.create(testUser);<% }
2626
if (filters.sequelizeModels) { %>return UserModel.create(testUser);<% } %>
2727
})
2828
.then(function() {
@@ -31,7 +31,7 @@ describe('Logout View', function() {
3131
});
3232

3333
after(function() {
34-
<% if (filters.mongooseModels) { %>return UserModel.removeAsync();<% }
34+
<% if (filters.mongooseModels) { %>return UserModel.remove();<% }
3535
if (filters.sequelizeModels) { %>return UserModel.destroy({ where: {} });<% } %>
3636
})
3737

Diff for: ‎app/templates/e2e/account(auth)/signup/signup.spec(jasmine).js

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ describe('Signup View', function() {
5252
describe('with local auth', function() {
5353

5454
beforeAll(function(done) {
55-
<% if (filters.mongooseModels) { %>UserModel.removeAsync().then(done);<% }
55+
<% if (filters.mongooseModels) { %>UserModel.remove().then(done);<% }
5656
if (filters.sequelizeModels) { %>UserModel.destroy({ where: {} }).then(done);<% } %>
5757
});
5858

Diff for: ‎app/templates/e2e/account(auth)/signup/signup.spec(mocha).js

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ describe('Signup View', function() {
2626
});
2727

2828
after(function() {
29-
<% if (filters.mongooseModels) { %>return UserModel.removeAsync();<% }
29+
<% if (filters.mongooseModels) { %>return UserModel.remove();<% }
3030
if (filters.sequelizeModels) { %>return UserModel.destroy({ where: {} });<% } %>
3131
});
3232

@@ -55,7 +55,7 @@ describe('Signup View', function() {
5555
describe('with local auth', function() {
5656

5757
before(function() {
58-
<% if (filters.mongooseModels) { %>return UserModel.removeAsync();<% }
58+
<% if (filters.mongooseModels) { %>return UserModel.remove();<% }
5959
if (filters.sequelizeModels) { %>return UserModel.destroy({ where: {} });<% } %>
6060
})
6161

Diff for: ‎app/templates/server/api/user(auth)/user.controller.js

+8-10
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ function handleError(res, statusCode) {
2525
* restriction: 'admin'
2626
*/
2727
export function index(req, res) {
28-
<% if (filters.mongooseModels) { %>User.findAsync({}, '-salt -password')<% }
28+
<% if (filters.mongooseModels) { %>User.find({}, '-salt -password').exec()<% }
2929
if (filters.sequelizeModels) { %>User.findAll({
3030
attributes: [
3131
'_id',
@@ -48,13 +48,12 @@ export function create(req, res, next) {
4848
<% if (filters.mongooseModels) { %>var newUser = new User(req.body);
4949
newUser.provider = 'local';
5050
newUser.role = 'user';
51-
newUser.saveAsync()<% }
51+
newUser.save()<% }
5252
if (filters.sequelizeModels) { %>var newUser = User.build(req.body);
5353
newUser.setDataValue('provider', 'local');
5454
newUser.setDataValue('role', 'user');
5555
newUser.save()<% } %>
56-
<% if (filters.mongooseModels) { %>.spread(function(user) {<% }
57-
if (filters.sequelizeModels) { %>.then(function(user) {<% } %>
56+
.then(function(user) {
5857
var token = jwt.sign({ _id: user._id }, config.secrets.session, {
5958
expiresIn: 60 * 60 * 5
6059
});
@@ -69,7 +68,7 @@ export function create(req, res, next) {
6968
export function show(req, res, next) {
7069
var userId = req.params.id;
7170

72-
<% if (filters.mongooseModels) { %>User.findByIdAsync(userId)<% }
71+
<% if (filters.mongooseModels) { %>User.findById(userId).exec()<% }
7372
if (filters.sequelizeModels) { %>User.find({
7473
where: {
7574
_id: userId
@@ -89,7 +88,7 @@ export function show(req, res, next) {
8988
* restriction: 'admin'
9089
*/
9190
export function destroy(req, res) {
92-
<% if (filters.mongooseModels) { %>User.findByIdAndRemoveAsync(req.params.id)<% }
91+
<% if (filters.mongooseModels) { %>User.findByIdAndRemove(req.params.id).exec()<% }
9392
if (filters.sequelizeModels) { %>User.destroy({ _id: req.params.id })<% } %>
9493
.then(function() {
9594
res.status(204).end();
@@ -105,7 +104,7 @@ export function changePassword(req, res, next) {
105104
var oldPass = String(req.body.oldPassword);
106105
var newPass = String(req.body.newPassword);
107106

108-
<% if (filters.mongooseModels) { %>User.findByIdAsync(userId)<% }
107+
<% if (filters.mongooseModels) { %>User.findById(userId).exec()<% }
109108
if (filters.sequelizeModels) { %>User.find({
110109
where: {
111110
_id: userId
@@ -114,8 +113,7 @@ export function changePassword(req, res, next) {
114113
.then(user => {
115114
if (user.authenticate(oldPass)) {
116115
user.password = newPass;
117-
<% if (filters.mongooseModels) { %>return user.saveAsync()<% }
118-
if (filters.sequelizeModels) { %>return user.save()<% } %>
116+
return user.save()
119117
.then(() => {
120118
res.status(204).end();
121119
})
@@ -132,7 +130,7 @@ export function changePassword(req, res, next) {
132130
export function me(req, res, next) {
133131
var userId = req.user._id;
134132

135-
<% if (filters.mongooseModels) { %>User.findOneAsync({ _id: userId }, '-salt -password')<% }
133+
<% if (filters.mongooseModels) { %>User.findOne({ _id: userId }, '-salt -password').exec()<% }
136134
if (filters.sequelizeModels) { %>User.find({
137135
where: {
138136
_id: userId

Diff for: ‎app/templates/server/api/user(auth)/user.integration.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ describe('User API:', function() {
1010

1111
// Clear users before testing
1212
before(function() {
13-
return <% if (filters.mongooseModels) { %>User.removeAsync().then(function() {<% }
13+
return <% if (filters.mongooseModels) { %>User.remove().then(function() {<% }
1414
if (filters.sequelizeModels) { %>User.destroy({ where: {} }).then(function() {<% } %>
1515
<% if (filters.mongooseModels) { %>user = new User({<% }
1616
if (filters.sequelizeModels) { %>user = User.build({<% } %>
@@ -19,14 +19,14 @@ describe('User API:', function() {
1919
password: 'password'
2020
});
2121

22-
return <% if (filters.mongooseModels) { %>user.saveAsync();<% }
22+
return <% if (filters.mongooseModels) { %>user.save();<% }
2323
if (filters.sequelizeModels) { %>user.save();<% } %>
2424
});
2525
});
2626

2727
// Clear users after testing
2828
after(function() {
29-
<% if (filters.mongooseModels) { %>return User.removeAsync();<% }
29+
<% if (filters.mongooseModels) { %>return User.remove();<% }
3030
if (filters.sequelizeModels) { %>return User.destroy({ where: {} });<% } %>
3131
});
3232

Diff for: ‎app/templates/server/api/user(auth)/user.model(mongooseModels).js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
'use strict';
22

33
import crypto from 'crypto';
4-
var mongoose = require('bluebird').promisifyAll(require('mongoose'));
4+
import mongoose from 'mongoose';
5+
mongoose.Promise = require('bluebird');
56
import {Schema} from 'mongoose';<% if (filters.oauth) { %>
67

78
const authTypes = ['github', 'twitter', 'facebook', 'google'];<% } %>
@@ -78,7 +79,7 @@ UserSchema
7879
.path('email')
7980
.validate(function(value, respond) {
8081
var self = this;
81-
return this.constructor.findOneAsync({ email: value })
82+
return this.constructor.findOne({ email: value }).exec()
8283
.then(function(user) {
8384
if (user) {
8485
if (self.id === user.id) {

Diff for: ‎app/templates/server/api/user(auth)/user.model.spec(mongooseModels).js

+9-9
Original file line numberDiff line numberDiff line change
@@ -16,40 +16,40 @@ var genUser = function() {
1616
describe('User Model', function() {
1717
before(function() {
1818
// Clear users before testing
19-
return User.removeAsync();
19+
return User.remove();
2020
});
2121

2222
beforeEach(function() {
2323
genUser();
2424
});
2525

2626
afterEach(function() {
27-
return User.removeAsync();
27+
return User.remove();
2828
});
2929

3030
it('should begin with no users', function() {
31-
return <%= expect() %>User.findAsync({})<%= to() %>
31+
return <%= expect() %>User.find({}).exec()<%= to() %>
3232
.eventually.have.length(0);
3333
});
3434

3535
it('should fail when saving a duplicate user', function() {
36-
return <%= expect() %>user.saveAsync()
36+
return <%= expect() %>user.save()
3737
.then(function() {
3838
var userDup = genUser();
39-
return userDup.saveAsync();
39+
return userDup.save();
4040
})<%= to() %>.be.rejected;
4141
});
4242

4343
describe('#email', function() {
4444
it('should fail when saving without an email', function() {
4545
user.email = '';
46-
return <%= expect() %>user.saveAsync()<%= to() %>.be.rejected;
46+
return <%= expect() %>user.save()<%= to() %>.be.rejected;
4747
});
4848
});
4949

5050
describe('#password', function() {
5151
beforeEach(function() {
52-
return user.saveAsync();
52+
return user.save();
5353
});
5454

5555
it('should authenticate user if valid', function() {
@@ -62,8 +62,8 @@ describe('User Model', function() {
6262

6363
it('should remain the same hash unless the password is updated', function() {
6464
user.name = 'Test User';
65-
return <%= expect() %>user.saveAsync()
66-
.spread(function(u) {
65+
return <%= expect() %>user.save()
66+
.then(function(u) {
6767
return u.authenticate('password');
6868
})<%= to() %>.eventually.be.true;
6969
});

Diff for: ‎app/templates/server/auth(auth)/auth.service.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export function isAuthenticated() {
2828
})
2929
// Attach user to request
3030
.use(function(req, res, next) {
31-
<% if (filters.mongooseModels) { %>User.findByIdAsync(req.user._id)<% }
31+
<% if (filters.mongooseModels) { %>User.findById(req.user._id).exec()<% }
3232
if (filters.sequelizeModels) { %>User.find({
3333
where: {
3434
_id: req.user._id

Diff for: ‎app/templates/server/auth(auth)/facebook(facebookAuth)/passport.js

+3-6
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ export function setup(User, config) {
1212
]
1313
},
1414
function(accessToken, refreshToken, profile, done) {
15-
<% if (filters.mongooseModels) { %>User.findOneAsync({<% }
16-
if (filters.sequelizeModels) { %>User.find({where:{<% } %>
17-
'facebook.id': profile.id
18-
<% if (filters.sequelizeModels) { %>}<% } %>})
15+
<% if (filters.mongooseModels) { %>User.findOne({'facebook.id': profile.id}).exec()<% }
16+
if (filters.sequelizeModels) { %>User.find({where:{'facebook.id': profile.id}})<% } %>
1917
.then(user => {
2018
if (user) {
2119
return done(null, user);
@@ -29,8 +27,7 @@ export function setup(User, config) {
2927
provider: 'facebook',
3028
facebook: profile._json
3129
});
32-
<% if (filters.mongooseModels) { %>user.saveAsync()<% }
33-
if (filters.sequelizeModels) { %>user.save()<% } %>
30+
user.save()
3431
.then(user => done(null, user))
3532
.catch(err => done(err));
3633
})

Diff for: ‎app/templates/server/auth(auth)/google(googleAuth)/passport.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@ export function setup(User, config) {
88
callbackURL: config.google.callbackURL
99
},
1010
function(accessToken, refreshToken, profile, done) {
11-
<% if (filters.mongooseModels) { %>User.findOneAsync({<% }
12-
if (filters.sequelizeModels) { %>User.find({where:{<% } %>
13-
'google.id': profile.id
14-
<% if (filters.sequelizeModels) { %>}<% } %>})
11+
<% if (filters.mongooseModels) { %>User.findOne({'google.id': profile.id}).exec()<% }
12+
if (filters.sequelizeModels) { %>User.find({where:{'google.id': profile.id}})<% } %>
1513
.then(user => {
1614
if (user) {
1715
return done(null, user);
@@ -26,7 +24,7 @@ export function setup(User, config) {
2624
provider: 'google',
2725
google: profile._json
2826
});
29-
<% if (filters.mongooseModels) { %>user.saveAsync()<% }
27+
<% if (filters.mongooseModels) { %>user.save()<% }
3028
if (filters.sequelizeModels) { %>user.save()<% } %>
3129
.then(user => done(null, user))
3230
.catch(err => done(err));

Diff for: ‎app/templates/server/auth(auth)/local/passport.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import passport from 'passport';
22
import {Strategy as LocalStrategy} from 'passport-local';
33

44
function localAuthenticate(User, email, password, done) {
5-
<% if (filters.mongooseModels) { %>User.findOneAsync({
5+
<% if (filters.mongooseModels) { %>User.findOne({
66
email: email.toLowerCase()
7-
})<% }
7+
}).exec()<% }
88
if (filters.sequelizeModels) { %>User.find({
99
where: {
1010
email: email.toLowerCase()

Diff for: ‎app/templates/server/auth(auth)/twitter(twitterAuth)/passport.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@ export function setup(User, config) {
88
callbackURL: config.twitter.callbackURL
99
},
1010
function(token, tokenSecret, profile, done) {
11-
<% if (filters.mongooseModels) { %>User.findOneAsync({<% }
12-
if (filters.sequelizeModels) { %>User.find({where:{<% } %>
13-
'twitter.id': profile.id
14-
<% if (filters.sequelizeModels) { %>}<% } %>})
11+
<% if (filters.mongooseModels) { %>User.findOne({'twitter.id': profile.id}).exec()<% }
12+
if (filters.sequelizeModels) { %>User.find({where:{'twitter.id': profile.id}})<% } %>
1513
.then(user => {
1614
if (user) {
1715
return done(null, user);
@@ -25,7 +23,7 @@ export function setup(User, config) {
2523
provider: 'twitter',
2624
twitter: profile._json
2725
});
28-
<% if (filters.mongooseModels) { %>user.saveAsync()<% }
26+
<% if (filters.mongooseModels) { %>user.save()<% }
2927
if (filters.sequelizeModels) { %>user.save()<% } %>
3028
.then(user => done(null, user))
3129
.catch(err => done(err));

Diff for: ‎app/templates/server/config/seed(models).js

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import sqldb from '../sqldb';
1010
var Thing = sqldb.Thing;<% if (filters.auth) { %>
1111
var User = sqldb.User;<% } %><% } %>
1212

13-
<% if (filters.mongooseModels) { %>Thing.find({}).removeAsync()<% }
13+
<% if (filters.mongooseModels) { %>Thing.find({}).remove()<% }
1414
if (filters.sequelizeModels) { %>Thing.sync()
1515
.then(() => {
1616
return Thing.destroy({ where: {} });
@@ -48,11 +48,11 @@ var User = sqldb.User;<% } %><% } %>
4848
if (filters.sequelizeModels) { %>}]);<% } %>
4949
});
5050
<% if (filters.auth) { %>
51-
<% if (filters.mongooseModels) { %>User.find({}).removeAsync()<% }
51+
<% if (filters.mongooseModels) { %>User.find({}).remove()<% }
5252
if (filters.sequelizeModels) { %>User.sync()
5353
.then(() => User.destroy({ where: {} }))<% } %>
5454
.then(() => {
55-
<% if (filters.mongooseModels) { %>User.createAsync({<% }
55+
<% if (filters.mongooseModels) { %>User.create({<% }
5656
if (filters.sequelizeModels) { %>User.bulkCreate([{<% } %>
5757
provider: 'local',
5858
name: 'Test User',

0 commit comments

Comments
 (0)