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

Update testing rig #219

Merged
merged 2 commits into from
Apr 26, 2016
Merged

Update testing rig #219

merged 2 commits into from
Apr 26, 2016

Conversation

levithomason
Copy link
Member

@levithomason levithomason commented Apr 26, 2016

This PR is a breakout of the massive rewrite to drop jQuery, #206.

@@ -10,13 +10,12 @@ module.exports = (karmaConfig) => {
singleRun: !argv.watch,
reporters: ['mocha'],
files: [
'./node_modules/babel-polyfill/dist/polyfill.js',
'./node_modules/phantomjs-polyfill/bind-polyfill.js',
Copy link
Member Author

Choose a reason for hiding this comment

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

New phantom no longer needs bind polyfill (or we stopped using it).

@levithomason levithomason force-pushed the feature/update-testing-rig branch from 2cb6ec2 to 2ffc860 Compare April 26, 2016 19:37
@@ -80,20 +80,17 @@
"highlight.js": "8.9.1",
"html-webpack-plugin": "^2.14.0",
"imports-loader": "^0.6.4",
"json": "^9.0.3",
Copy link
Member Author

Choose a reason for hiding this comment

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

cruft

@eanplatter
Copy link
Contributor

eanplatter commented Apr 26, 2016

🍂 once the branch is up to date with master and it passes CI

@levithomason levithomason force-pushed the feature/update-testing-rig branch from 2ffc860 to ccad247 Compare April 26, 2016 19:42
@ghost
Copy link

ghost commented Apr 26, 2016

@levithomason levithomason merged commit b78cdc6 into master Apr 26, 2016
@levithomason levithomason deleted the feature/update-testing-rig branch April 26, 2016 19:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants