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.

Sign up for GitHub

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

Jump to bottom

Fix avg coverage_strength for a group of files #192

Merged
merged 4 commits into from
Nov 10, 2013
Merged

Fix avg coverage_strength for a group of files #192

merged 4 commits into from
Nov 10, 2013

Conversation

c-lliope
Copy link
Contributor

Fix issue 179

Had to change existing test cases in test/test_file_list.rb, because I needed fixtures in which lines of code were tested multiple times.

@c-lliope c-lliope mentioned this pull request Jan 20, 2013
Closed
@colszowka
Copy link
Collaborator

Nice, thanks!

@colszowka
Copy link
Collaborator

(PR can't be merged by GH at the moment due to other PRs that conflict with it, I'll merge manually ASAP. Keeping open so long)

@c-lliope
Copy link
Contributor Author

What other PRs are conflicting? I can try to work on it.

@colszowka
Copy link
Collaborator

I'm not sure as Github only says "cannot be automatically merged", but it might just be the Changelog (I am not aware of recent changes to the source code parts of your PR off the top of my head, so it's probably that). If you've got the time to amend that'd be great!

@c-lliope
Merge https://github.com/colszowka/simplecov
6c3a644 
Conflicts:
	CHANGELOG.md
	test/test_file_list.rb
@c-lliope
Copy link
Contributor Author

c-lliope commented Mar 3, 2013

There -- it was a conflict with the Changelog, as well as the refactoring of the on_ruby helper here: 16b2848

Should be an easy merge now.

@c-lliope
Copy link
Contributor Author

c-lliope commented Apr 9, 2013

What are your thoughts on this PR? I just pulled master, so it should be a painless merge.

colszowka added a commit that referenced this pull request Nov 10, 2013
@colszowka
Merge #192
2783364
@colszowka colszowka merged commit d03908c into simplecov-ruby:master Nov 10, 2013
@colszowka
Copy link
Collaborator

Merged, thanks a lot! I'll ship this as part of 0.8.0 today.

@c-lliope
Copy link
Contributor Author

(=

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

All Files hits/lines value appears to be improperly weighted
2 participants
@c-lliope @colszowka