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(@schematics/angular): --minimal should prevent generating e2e #12742

Merged
merged 3 commits into from
Nov 1, 2018

Conversation

nweldev
Copy link
Contributor

@nweldev nweldev commented Oct 24, 2018

Don't run the e2e schematic when using application or ng-new schematics
with option.minimal set to true.

fix #12739

Couldn't test it works with ng new, let me know if I should write a test for that.

@alan-agius4
Copy link
Collaborator

@noelmace, thanks for this. I think adding a test would definitely be beneficial, even to avoid possible regressions in the future.

@@ -368,7 +368,7 @@ export default function (options: ApplicationOptions): Rule {
}),
move(sourceDir),
]), MergeStrategy.Overwrite),
schematic('e2e', e2eOptions),
!options.minimal ? schematic('e2e', e2eOptions) : noop(),
Copy link
Member

Choose a reason for hiding this comment

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

can you invert the logic and remove the negation?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure! I tough it was a kind of convention to use noop as "else" 😅

@clydin clydin added the target: major This PR is targeted for the next major release label Oct 25, 2018
@alan-agius4 alan-agius4 added target: patch This PR is targeted for the next patch release and removed target: major This PR is targeted for the next major release labels Oct 29, 2018
@kyliau
Copy link
Contributor

kyliau commented Nov 1, 2018

@noelmace Could you please rebase and fix the conflicts?

@ngbot
Copy link

ngbot bot commented Nov 1, 2018

Hi @noelmace! This PR has merge conflicts due to recent upstream merges.
Please help to unblock it by resolving these conflicts. Thanks!

@alexeagle
Copy link
Contributor

I rebased it and force-pushed to your branch

@alexeagle alexeagle merged commit 1f3e276 into angular:master Nov 1, 2018
alexeagle pushed a commit that referenced this pull request Nov 1, 2018
…2742)

* fix(@schematics/angular): --minimal should prevent generating e2e

Don't run the e2e schematic when using application or ng-new schematics
with option.minimal set to true.

fix #12739

* style: inverse logic according to feedback

* test(@schematics/angular): app and ng-new --minimal shouldn't generate e2e
@nweldev
Copy link
Contributor Author

nweldev commented Nov 4, 2018

Thx @alexeagle for the rebase, I didn'ts saw it soon enough.

@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 12, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
target: patch This PR is targeted for the next patch release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

@schematics/angular --minimal still generate e2e project
7 participants