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(karma): set defaults for karma.conf.js #1837

Merged
merged 1 commit into from
Sep 21, 2016

Conversation

JSMike
Copy link
Contributor

@JSMike JSMike commented Aug 25, 2016

The karma plugin is currently overwriting configuration set in karma.conf.js instead of merging existing values. This fix will set defaults but not overwrite existing configuration.

@JSMike JSMike force-pushed the karmaWebpackMiddleware branch from 0075d6f to ad8f1b7 Compare August 25, 2016 16:27
@JSMike
Copy link
Contributor Author

JSMike commented Aug 25, 2016

Note, I ran into this issue when trying to add the following to the karma.conf.js:

    webpackMiddleware: {
      watchOptions: {
        poll: 1000
      }
    }

With the current karma plugin all webpack and webpackMiddleware configuration in karma.conf.js is overwritten.

With this fix the defaults are set for webpack and webpackMiddleware, and any values set in karma.conf.js will also be applied, and/or overwrite the defaults.

@JSMike JSMike force-pushed the karmaWebpackMiddleware branch 6 times, most recently from 24d64f9 to 371e2c4 Compare September 1, 2016 14:35
@JSMike
Copy link
Contributor Author

JSMike commented Sep 1, 2016

Cleaned up PR to create variable instead of using inline object.

@JSMike JSMike force-pushed the karmaWebpackMiddleware branch 5 times, most recently from a419523 to 914c4a7 Compare September 7, 2016 04:25
@JSMike JSMike force-pushed the karmaWebpackMiddleware branch 5 times, most recently from 384d459 to b52886f Compare September 19, 2016 15:20
The karma plugin is currently overwriting configuration set in karma.conf.js instead of merging existing values. This fix will set defaults but not overwrite existing configuration.
@JSMike JSMike force-pushed the karmaWebpackMiddleware branch from b52886f to 8baf151 Compare September 20, 2016 11:43
@filipesilva filipesilva merged commit e2e94a5 into angular:master Sep 21, 2016
abner pushed a commit to abner/angular-cli that referenced this pull request Sep 24, 2016
The karma plugin is currently overwriting configuration set in karma.conf.js instead of merging existing values. This fix will set defaults but not overwrite existing configuration.
JJayet pushed a commit to JJayet/angular-cli that referenced this pull request Oct 2, 2016
The karma plugin is currently overwriting configuration set in karma.conf.js instead of merging existing values. This fix will set defaults but not overwrite existing configuration.
@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 10, 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