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 tests #92

Merged
merged 4 commits into from
May 12, 2017
Merged

Fix tests #92

merged 4 commits into from
May 12, 2017

Conversation

marshallswain
Copy link
Contributor

@marshallswain marshallswain commented May 1, 2017

This gets the tests to pass in Travis. Based on the suggestions in karma-runner/karma-phantomjs-launcher#120

Hopefully this will lighten the workload a bit and make it easier to merge all of the other PRs after they are brought up to date with these changes.

@marshallswain marshallswain changed the title Upgrade karma-phantom-launcher to latest WIP - Do Not Merge: Upgrade karma-phantom-launcher to latest May 1, 2017
@marshallswain marshallswain changed the title WIP - Do Not Merge: Upgrade karma-phantom-launcher to latest WIP - Do Not Merge: Fix tests May 1, 2017
@codecov-io
Copy link

codecov-io commented May 1, 2017

Codecov Report

❗ No coverage uploaded for pull request base (master@39fea55). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master      #92   +/-   ##
=========================================
  Coverage          ?   24.75%           
=========================================
  Files             ?       18           
  Lines             ?      202           
  Branches          ?        0           
=========================================
  Hits              ?       50           
  Misses            ?      152           
  Partials          ?        0

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 39fea55...9f7e649. Read the comment docs.

@marshallswain marshallswain changed the title WIP - Do Not Merge: Fix tests Fix tests May 1, 2017
@marshallswain
Copy link
Contributor Author

@declandewet I'm not sure why the codecov/project CI is failing. Maybe the previous merge didn't successfully pass tests?

@marshallswain
Copy link
Contributor Author

Hopefully this will allow us to merge #84

@atinux atinux merged commit 672ffc8 into nuxt:master May 12, 2017
@marshallswain marshallswain deleted the fix-travis branch May 12, 2017 15:12
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.

3 participants