Skip to content
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.

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

fix(new): exclude non spec files from test.ts #3538

Merged
merged 1 commit into from
Dec 16, 2016
Merged

Conversation

Meligy
Copy link
Contributor

@Meligy Meligy commented Dec 13, 2016

At the moment if you have a merge conflict, and it leaves you with blah.spec.ts.orig files (file used by git for diff checking), you can just add it to gitignore (might add it in another PR), but when you run ng test the next time, you get the error:

Module parse failed: <SOME_PROJECT_APP_FOLDER_PATH>\blah.spec.ts.orig Unexpected token (xx:xx)
You may need an appropriate loader to handle this file type.

This PR excludes these false positives.

At the moment if you have a merge conflict, and it leaves you with `blah.spec.ts.orig` files (file used by git for diff checking), you can just add it to gitignore (might add it in another PR), but when you run `ng test` the next time, you get the error:

```
Module parse failed: <SOME_PROJECT_APP_FOLDER_PATH>\blah.spec.ts.orig Unexpected token (xx:xx)
You may need an appropriate loader to handle this file type.
```

This PR excludes these false positives.
@hansl
Copy link
Contributor

hansl commented Dec 16, 2016

LGTM. Thanks for finding this!

@hansl hansl merged commit bcb324f into angular:master Dec 16, 2016
MRHarrison pushed a commit to MRHarrison/angular-cli that referenced this pull request Feb 9, 2017
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 11, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants