Skip to content

Commit 5bc5656

Browse files
committed
Revert "fix(mocha): have tests clean up once complete"
This reverts commit 99a5705.
1 parent 6b17ef7 commit 5bc5656

File tree

4 files changed

+3
-16
lines changed

4 files changed

+3
-16
lines changed

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

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

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

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

2827
// Clear users after testing
2928
after(function() {
30-
app.angularFullstack.close();
31-
<% if (filters.mongooseModels) { %>User.remove();
32-
mongoose.connection.close();<% }
29+
<% if (filters.mongooseModels) { %>return User.removeAsync();<% }
3330
if (filters.sequelizeModels) { %>return User.destroy({ where: {} });<% } %>
3431
});
3532

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

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

33
import app from '../..';
4-
import mongoose from 'mongoose';
54
import User from './user.model';
65
var user;
76
var genUser = function() {
@@ -28,11 +27,6 @@ describe('User Model', function() {
2827
return User.removeAsync();
2928
});
3029

31-
after(function() {
32-
app.angularFullstack.close();
33-
mongoose.connection.close();
34-
});
35-
3630
it('should begin with no users', function() {
3731
return <%= expect() %>User.findAsync({})<%= to() %>
3832
.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-
app.angularFullstack = server.listen(config.port, config.ip, function() {
37+
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,10 +7,6 @@ var new<%= classedName %>;<% } %>
77

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

10-
after(function() {
11-
app.angularFullstack.close();
12-
});
13-
1410
describe('GET <%= route %>', function() {
1511
var <%= cameledName %>s;
1612

0 commit comments

Comments
 (0)