Skip to content

refactor(user.model.spec): reduce callback hell #1150

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

Closed
deltreey wants to merge 2 commits into from
Closed

refactor(user.model.spec): reduce callback hell #1150

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0c7917
refactor(user.model.spec): reduce callback hell
Aug 10, 2015
3feb92a
fix(user.model.spec): have to bind context for mongoose
Aug 10, 2015
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
18 changes: 5 additions & 13 deletions app/templates/server/api/user(auth)/user.model.spec(mongooseModels).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,12 @@ var genUser = function() {
};

describe('User Model', function() {
before(function() {
// Clear users before testing
return User.removeAsync();
});
// Clear users before testing
before(User.removeAsync);
Copy link
Copy Markdown
Member

@kingcody kingcody Aug 10, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@deltreey my apologies, I should have mentioned that the User methods will lose context to their parent object, so they'll need to be bound like: User.removeAsync.bind(User)

Copy link
Copy Markdown
Collaborator

@Awk34 Awk34 Aug 11, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Babel supports ::User.removeAsync too, right?


beforeEach(function() {
genUser();
});
beforeEach(genUser);

afterEach(function() {
return User.removeAsync();
});
afterEach(User.removeAsync);

it('should begin with no users', function() {
return User.findAsync({})
Expand All @@ -48,9 +42,7 @@ describe('User Model', function() {
});

describe('#password', function() {
beforeEach(function() {
return user.saveAsync();
});
beforeEach(user.saveAsync);

it('should authenticate user if valid', function() {
user.authenticate('password').should.be.true;
Expand Down
8 changes: 2 additions & 6 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 @@ -21,9 +21,7 @@ describe('User Model', function() {
});
});

beforeEach(function() {
genUser();
});
beforeEach(genUser);

afterEach(function() {
return User.destroy({ where: {} });
Expand All @@ -50,9 +48,7 @@ describe('User Model', function() {
});

describe('#password', function() {
beforeEach(function() {
return user.save();
});
beforeEach(user.save);

it('should authenticate user if valid', function() {
user.authenticate('password').should.be.true;
Expand Down