Skip to content

fix(test): update sequelize destroy usage #1007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 21, 2015
Merged

fix(test): update sequelize destroy usage #1007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/templates/e2e/account(auth)/login/login.spec(jasmine).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe('Login View', function() {

beforeEach(function(done) {
<% if (filters.mongooseModels) { %>UserModel.removeAsync()<% }
if (filters.sequelizeModels) { %>UserModel.destroy()<% } %>
if (filters.sequelizeModels) { %>UserModel.destroy({ where: {} })<% } %>
.then(function() {
<% if (filters.mongooseModels) { %>return UserModel.createAsync(testUser);<% }
if (filters.sequelizeModels) { %>return UserModel.create(testUser);<% } %>
Expand Down
4 changes: 2 additions & 2 deletions app/templates/e2e/account(auth)/login/login.spec(mocha).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe('Login View', function() {
before(function() {
return UserModel
<% if (filters.mongooseModels) { %>.removeAsync()<% }
if (filters.sequelizeModels) { %>.destroy()<% } %>
if (filters.sequelizeModels) { %>.destroy({ where: {} })<% } %>
.then(function() {
<% if (filters.mongooseModels) { %>return UserModel.createAsync(testUser);<% }
if (filters.sequelizeModels) { %>return UserModel.create(testUser);<% } %>
Expand All @@ -31,7 +31,7 @@ describe('Login View', function() {

after(function() {
<% if (filters.mongooseModels) { %>return UserModel.removeAsync();<% }
if (filters.sequelizeModels) { %>return UserModel.destroy();<% } %>
if (filters.sequelizeModels) { %>return UserModel.destroy({ where: {} });<% } %>
});

it('should include login form with correct inputs and submit button', function() {
Expand Down
2 changes: 1 addition & 1 deletion app/templates/e2e/account(auth)/logout/logout.spec(jasmine).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ describe('Logout View', function() {

beforeEach(function(done) {
<% if (filters.mongooseModels) { %>UserModel.removeAsync()<% }
if (filters.sequelizeModels) { %>UserModel.destroy()<% } %>
if (filters.sequelizeModels) { %>UserModel.destroy({ where: {} })<% } %>
.then(function() {
<% if (filters.mongooseModels) { %>return UserModel.createAsync(testUser);<% }
if (filters.sequelizeModels) { %>return UserModel.create(testUser);<% } %>
Expand Down
4 changes: 2 additions & 2 deletions app/templates/e2e/account(auth)/logout/logout.spec(mocha).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe('Logout View', function() {
beforeEach(function() {
return UserModel
<% if (filters.mongooseModels) { %>.removeAsync()<% }
if (filters.sequelizeModels) { %>.destroy()<% } %>
if (filters.sequelizeModels) { %>.destroy({ where: {} })<% } %>
.then(function() {
<% if (filters.mongooseModels) { %>return UserModel.createAsync(testUser);<% }
if (filters.sequelizeModels) { %>return UserModel.create(testUser);<% } %>
Expand All @@ -31,7 +31,7 @@ describe('Logout View', function() {

after(function() {
<% if (filters.mongooseModels) { %>return UserModel.removeAsync();<% }
if (filters.sequelizeModels) { %>return UserModel.destroy();<% } %>
if (filters.sequelizeModels) { %>return UserModel.destroy({ where: {} });<% } %>
})

describe('with local auth', function() {
Expand Down
2 changes: 1 addition & 1 deletion app/templates/e2e/account(auth)/signup/signup.spec(jasmine).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ describe('Signup View', function() {

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

var navbar = require('../../components/navbar/navbar.po');
Expand Down
4 changes: 2 additions & 2 deletions app/templates/e2e/account(auth)/signup/signup.spec(mocha).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe('Signup View', function() {

after(function() {
<% if (filters.mongooseModels) { %>return UserModel.removeAsync();<% }
if (filters.sequelizeModels) { %>return UserModel.destroy();<% } %>
if (filters.sequelizeModels) { %>return UserModel.destroy({ where: {} });<% } %>
});

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

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

var navbar = require('../../components/navbar/navbar.po');
Expand Down
23 changes: 7 additions & 16 deletions app/templates/server/api/user(auth)/user.integration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,25 @@ describe('User API:', function() {
var user;

// Clear users before testing
before(function(done) {
<% if (filters.mongooseModels) { %>User.remove(function() {<% }
if (filters.sequelizeModels) { %>User.destroy().then(function() {<% } %>
before(function() {
return <% if (filters.mongooseModels) { %>User.removeAsync().then(function() {<% }
if (filters.sequelizeModels) { %>User.destroy({ where: {} }).then(function() {<% } %>
<% if (filters.mongooseModels) { %>user = new User({<% }
if (filters.sequelizeModels) { %>user = User.build({<% } %>
name: 'Fake User',
email: '[email protected]',
password: 'password'
});

<% if (filters.mongooseModels) { %>user.save(function(err) {
if (err) {
return done(err);
}
done();
});<% }
if (filters.sequelizeModels) { %>user.save().then(function() {
done();
}, function(err) {
return done(err);
});<% } %>
return <% if (filters.mongooseModels) { %>user.saveAsync();<% }
if (filters.sequelizeModels) { %>user.save();<% } %>
});
});

// Clear users after testing
after(function() {
<% if (filters.mongooseModels) { %>return User.remove().exec();<% }
if (filters.sequelizeModels) { %>return User.destroy();<% } %>
<% if (filters.mongooseModels) { %>return User.removeAsync();<% }
if (filters.sequelizeModels) { %>return User.destroy({ where: {} });<% } %>
});

describe('GET /api/users/me', function() {
Expand Down
6 changes: 3 additions & 3 deletions app/templates/server/api/user(auth)/user.model.spec(sequelizeModels).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ var user = User.build(userTemplate);
describe('User Model', function() {
before(function() {
// Sync and clear users before testing
User.sync().then(function() {
return User.destroy();
return User.sync().then(function() {
return User.destroy({ where: {} });
});
});

afterEach(function() {
return User.destroy();
return User.destroy({ where: {} });
});

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