Skip to content

Commit 8df9992

Browse files
committed
fix(test): update sequelize destroy usage
1 parent 710d04e commit 8df9992

File tree

8 files changed

+19
-28
lines changed

8 files changed

+19
-28
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ describe('Login View', function() {
2020

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ describe('Login View', function() {
2121
before(function() {
2222
return UserModel
2323
<% if (filters.mongooseModels) { %>.removeAsync()<% }
24-
if (filters.sequelizeModels) { %>.destroy()<% } %>
24+
if (filters.sequelizeModels) { %>.destroy({ where: {} })<% } %>
2525
.then(function() {
2626
<% if (filters.mongooseModels) { %>return UserModel.createAsync(testUser);<% }
2727
if (filters.sequelizeModels) { %>return UserModel.create(testUser);<% } %>
@@ -31,7 +31,7 @@ describe('Login View', function() {
3131

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

3737
it('should include login form with correct inputs and submit button', function() {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ describe('Logout View', function() {
1818

1919
beforeEach(function(done) {
2020
<% if (filters.mongooseModels) { %>UserModel.removeAsync()<% }
21-
if (filters.sequelizeModels) { %>UserModel.destroy()<% } %>
21+
if (filters.sequelizeModels) { %>UserModel.destroy({ where: {} })<% } %>
2222
.then(function() {
2323
<% if (filters.mongooseModels) { %>return UserModel.createAsync(testUser);<% }
2424
if (filters.sequelizeModels) { %>return UserModel.create(testUser);<% } %>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ describe('Logout View', function() {
1919
beforeEach(function() {
2020
return UserModel
2121
<% if (filters.mongooseModels) { %>.removeAsync()<% }
22-
if (filters.sequelizeModels) { %>.destroy()<% } %>
22+
if (filters.sequelizeModels) { %>.destroy({ where: {} })<% } %>
2323
.then(function() {
2424
<% if (filters.mongooseModels) { %>return UserModel.createAsync(testUser);<% }
2525
if (filters.sequelizeModels) { %>return UserModel.create(testUser);<% } %>
@@ -31,7 +31,7 @@ describe('Logout View', function() {
3131

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

3737
describe('with local auth', function() {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ describe('Signup View', function() {
3737

3838
it('should signup a new user, log them in, and redirecting to "/"', function(done) {
3939
<% if (filters.mongooseModels) { %>UserModel.remove(function() {<% }
40-
if (filters.sequelizeModels) { %>UserModel.destroy().then(function() {<% } %>
40+
if (filters.sequelizeModels) { %>UserModel.destroy({ where: {} }).then(function() {<% } %>
4141
page.signup(testUser);
4242

4343
var navbar = require('../../components/navbar/navbar.po');

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ describe('Signup View', function() {
2424

2525
after(function() {
2626
<% if (filters.mongooseModels) { %>return UserModel.removeAsync();<% }
27-
if (filters.sequelizeModels) { %>return UserModel.destroy();<% } %>
27+
if (filters.sequelizeModels) { %>return UserModel.destroy({ where: {} });<% } %>
2828
});
2929

3030
it('should include signup form with correct inputs and submit button', function() {
@@ -42,7 +42,7 @@ describe('Signup View', function() {
4242

4343
it('should signup a new user, log them in, and redirecting to "/"', function(done) {
4444
<% if (filters.mongooseModels) { %>UserModel.remove(function() {<% }
45-
if (filters.sequelizeModels) { %>UserModel.destroy().then(function() {<% } %>
45+
if (filters.sequelizeModels) { %>UserModel.destroy({ where: {} }).then(function() {<% } %>
4646
page.signup(testUser);
4747

4848
var navbar = require('../../components/navbar/navbar.po');

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

+7-16
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,25 @@ describe('User API:', function() {
99
var user;
1010

1111
// Clear users before testing
12-
before(function(done) {
13-
<% if (filters.mongooseModels) { %>User.remove(function() {<% }
14-
if (filters.sequelizeModels) { %>User.destroy().then(function() {<% } %>
12+
before(function() {
13+
return <% if (filters.mongooseModels) { %>User.removeAsync().then(function() {<% }
14+
if (filters.sequelizeModels) { %>User.destroy({ where: {} }).then(function() {<% } %>
1515
<% if (filters.mongooseModels) { %>user = new User({<% }
1616
if (filters.sequelizeModels) { %>user = User.build({<% } %>
1717
name: 'Fake User',
1818
1919
password: 'password'
2020
});
2121

22-
<% if (filters.mongooseModels) { %>user.save(function(err) {
23-
if (err) {
24-
return done(err);
25-
}
26-
done();
27-
});<% }
28-
if (filters.sequelizeModels) { %>user.save().then(function() {
29-
done();
30-
}, function(err) {
31-
return done(err);
32-
});<% } %>
22+
return <% if (filters.mongooseModels) { %>user.saveAsync();<% }
23+
if (filters.sequelizeModels) { %>user.save();<% } %>
3324
});
3425
});
3526

3627
// Clear users after testing
3728
after(function() {
38-
<% if (filters.mongooseModels) { %>return User.remove().exec();<% }
39-
if (filters.sequelizeModels) { %>return User.destroy();<% } %>
29+
<% if (filters.mongooseModels) { %>return User.removeAsync();<% }
30+
if (filters.sequelizeModels) { %>return User.destroy({ where: {} });<% } %>
4031
});
4132

4233
describe('GET /api/users/me', function() {

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ var user = User.build(userTemplate);
1515
describe('User Model', function() {
1616
before(function() {
1717
// Sync and clear users before testing
18-
User.sync().then(function() {
19-
return User.destroy();
18+
return User.sync().then(function() {
19+
return User.destroy({ where: {} });
2020
});
2121
});
2222

2323
afterEach(function() {
24-
return User.destroy();
24+
return User.destroy({ where: {} });
2525
});
2626

2727
it('should begin with no users', function() {

0 commit comments

Comments
 (0)