Skip to content
This repository has been archived by the owner on Aug 30, 2021. It is now read-only.

Adds support for re-running server and client tests automatically #157

Merged
merged 1 commit into from
Jan 24, 2015
Merged

Adds support for re-running server and client tests automatically #157

merged 1 commit into from
Jan 24, 2015

Conversation

miguelcoba
Copy link
Contributor

Adds two more tasks to execute server and client tests separately

To run full suite
grunt test

To run only server tests
grunt test:server

To run only client tests
grunt test:client

Fixes #155

@ilanbiala
Copy link
Member

@miguelcoba what about gulp?

@androidfred
Copy link
Contributor

What's the status of this issue? Have the merge conflicts been resolved and the issue merged or...?

@ilanbiala
Copy link
Member

@lirantal @NeverOddOrEven I think it's a good idea to have 2 separate tests, and just call them together in the grunt test command. Thoughts? I can probably put together a Gulp version if we want to bring this in.

@miguelcoba
Copy link
Contributor Author

I don't know what the merge conflicts could be, in August when I opened the bug and created the MR it merged without warnings. Also, in that time, only grunt was supported, that's why I only did the grunt test. I suppose that it would be easy to port it to gulp.

@ilanbiala
Copy link
Member

@miguelcoba you have to rebase your changes off of the new master. Once you do that we'll be able to review it.

@lirantal
Copy link
Member

lirantal commented Jan 9, 2015

@ilanbiala I agree, sounds like a nice idea. @miguelcoba it's impossible to merge this due to changes already commited on the same files you changed.

@NeverOddOrEven
Copy link
Contributor

I like this idea.

@ilanbiala
Copy link
Member

@miguelcoba can you either rebase your changes so that we can merge this PR or open a new PR that will merge without conflicts?

Adds two more tasks to execute server and client tests separately

To run full suite
grunt test

To run only server tests
grunt test:server

To run only client tests
grunt test:client

Fixes #155
@miguelcoba
Copy link
Contributor Author

I did a rebase of pull request code to upstream/master code. This can be merged now to master.

@ilanbiala
Copy link
Member

@miguelcoba looks good. @lirantal @NeverOddOrEven @roieki @amoshaviv I'll merge this if someone gives another +1.

@lirantal
Copy link
Member

lgtm @ilanbiala, you can go ahead and merge.

ilanbiala added a commit that referenced this pull request Jan 24, 2015
Adds support for re-running server and client tests automatically
@ilanbiala ilanbiala merged commit 3973595 into meanjs:master Jan 24, 2015
@ilanbiala ilanbiala self-assigned this Jan 24, 2015
@miguelcoba miguelcoba deleted the issue-155 branch January 24, 2015 19:12
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Re-run server and angular tests on tests modification
5 participants