Skip to content

Commit 99a5705

Browse files
committed
fix(mocha): have tests clean up once complete
mocha unit and integration tests will hang unless express (and optionally mongoose) are closed once the tests are complete
1 parent 20460a5 commit 99a5705

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed

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

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

33
import app from '../..';<% if (filters.mongooseModels) { %>
4-
import User from './user.model';<% } %><% if (filters.sequelizeModels) { %>
4+
import User from './user.model';
5+
import mongoose from 'mongoose';<% } %><% if (filters.sequelizeModels) { %>
56
import {User} from '../../sqldb';<% } %>
67
import request from 'supertest';
78

@@ -26,7 +27,9 @@ describe('User API:', function() {
2627

2728
// Clear users after testing
2829
after(function() {
29-
<% if (filters.mongooseModels) { %>return User.removeAsync();<% }
30+
app.angularFullstack.close();
31+
<% if (filters.mongooseModels) { %>User.remove();
32+
mongoose.connection.close();<% }
3033
if (filters.sequelizeModels) { %>return User.destroy({ where: {} });<% } %>
3134
});
3235

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

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

33
import app from '../..';
4+
import mongoose from 'mongoose';
45
import User from './user.model';
56
var user;
67
var genUser = function() {
@@ -27,6 +28,11 @@ describe('User Model', function() {
2728
return User.removeAsync();
2829
});
2930

31+
after(function() {
32+
app.angularFullstack.close();
33+
mongoose.connection.close();
34+
});
35+
3036
it('should begin with no users', function() {
3137
return <%= expect() %>User.findAsync({})<%= to() %>
3238
.eventually.have.length(0);

Diff for: app/templates/server/app.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ require('./routes')(app);
3434

3535
// Start server
3636
function startServer() {
37-
server.listen(config.port, config.ip, function() {
37+
app.angularFullstack = server.listen(config.port, config.ip, function() {
3838
console.log('Express server listening on %d, in %s mode', config.port, app.get('env'));
3939
});
4040
}

Diff for: endpoint/templates/basename.integration.js

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ var new<%= classedName %>;<% } %>
77

88
describe('<%= classedName %> API:', function() {
99

10+
after(function() {
11+
app.angularFullstack.close();
12+
});
13+
1014
describe('GET <%= route %>', function() {
1115
var <%= cameledName %>s;
1216

0 commit comments

Comments
 (0)