diff --git a/app/templates/e2e/account(auth)/login/login.spec(jasmine).js b/app/templates/e2e/account(auth)/login/login.spec(jasmine).js index e690c2601..c738f9370 100644 --- a/app/templates/e2e/account(auth)/login/login.spec(jasmine).js +++ b/app/templates/e2e/account(auth)/login/login.spec(jasmine).js @@ -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);<% } %> diff --git a/app/templates/e2e/account(auth)/login/login.spec(mocha).js b/app/templates/e2e/account(auth)/login/login.spec(mocha).js index 3335cf3b4..6b3158726 100644 --- a/app/templates/e2e/account(auth)/login/login.spec(mocha).js +++ b/app/templates/e2e/account(auth)/login/login.spec(mocha).js @@ -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);<% } %> @@ -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() { diff --git a/app/templates/e2e/account(auth)/logout/logout.spec(jasmine).js b/app/templates/e2e/account(auth)/logout/logout.spec(jasmine).js index f3149865c..ae4bb23a0 100644 --- a/app/templates/e2e/account(auth)/logout/logout.spec(jasmine).js +++ b/app/templates/e2e/account(auth)/logout/logout.spec(jasmine).js @@ -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);<% } %> diff --git a/app/templates/e2e/account(auth)/logout/logout.spec(mocha).js b/app/templates/e2e/account(auth)/logout/logout.spec(mocha).js index 85d92cf75..ef9f6d4da 100644 --- a/app/templates/e2e/account(auth)/logout/logout.spec(mocha).js +++ b/app/templates/e2e/account(auth)/logout/logout.spec(mocha).js @@ -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);<% } %> @@ -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() { diff --git a/app/templates/e2e/account(auth)/signup/signup.spec(jasmine).js b/app/templates/e2e/account(auth)/signup/signup.spec(jasmine).js index abbfc98a4..511a84933 100644 --- a/app/templates/e2e/account(auth)/signup/signup.spec(jasmine).js +++ b/app/templates/e2e/account(auth)/signup/signup.spec(jasmine).js @@ -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'); diff --git a/app/templates/e2e/account(auth)/signup/signup.spec(mocha).js b/app/templates/e2e/account(auth)/signup/signup.spec(mocha).js index 5351ea75d..852a3cb71 100644 --- a/app/templates/e2e/account(auth)/signup/signup.spec(mocha).js +++ b/app/templates/e2e/account(auth)/signup/signup.spec(mocha).js @@ -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() { @@ -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'); diff --git a/app/templates/server/api/user(auth)/user.integration.js b/app/templates/server/api/user(auth)/user.integration.js index 35bcdb573..5273be72a 100644 --- a/app/templates/server/api/user(auth)/user.integration.js +++ b/app/templates/server/api/user(auth)/user.integration.js @@ -9,9 +9,9 @@ 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', @@ -19,24 +19,15 @@ describe('User API:', function() { 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() { diff --git a/app/templates/server/api/user(auth)/user.model.spec(sequelizeModels).js b/app/templates/server/api/user(auth)/user.model.spec(sequelizeModels).js index 88156151b..f499667cd 100644 --- a/app/templates/server/api/user(auth)/user.model.spec(sequelizeModels).js +++ b/app/templates/server/api/user(auth)/user.model.spec(sequelizeModels).js @@ -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() {