Conversation
Changes: - add prompt for Jasmine or Mocha - if Mocha choosen, prompt for Expect or Should - use `<%= does() %>` to dynamically insert assertions (expect|should) - add mocha variants for protractor tests - add mocha options to protractor.conf - remove `test/fixtures/(bower|package).json` from repo - move runE2E functionality to runTest and simplify switch - comment generator test functions - use node `0.11.13` in travis due to issues with `0.11.14`+ Note: Server-side jasmine test are needed to fully unify testing frameworks. Once Jasmine tests are included for server, mocha dep can be removed fully when selecting Jasmine.
feat(gen): unify testing framework
docs(gen:endpoint): standardized comments
…s not specified fixes #590
#closes 606
Conflicts: app/templates/Gruntfile.js app/templates/_bower.json test/fixtures/package.json
Conflicts: app/templates/server/config/express.js
feat(gen): move babel choice to script list
feat(gen): add david grunt task
chore(deps): remove angular-scenario module
feat(server:auth): add role to signToken
feat(app): server ships with babel
fix(app): only generate excludes for included deps
feat(gen): test helper `does` accepts escaped template strings
fix(app): karma requires `babel` always
…r-fullstack into gulp Conflicts: app/index.js app/templates/_package.json app/templates/client/app/app(sass).scss
Collaborator
Author
|
Hah, just noticed this PR is targeting |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
18 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Needs: