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

merge dot file settings and project settings #122

Merged
merged 2 commits into from
Dec 24, 2017
Merged

Conversation

smeevil
Copy link
Contributor

@smeevil smeevil commented Dec 14, 2017

Hi,

So I'm using the dot file settings quite a lot to customise the report template and to add some global ignores. Working with other projects I found that it would be very useful if the coveralls.json defined in the project would merge its settings with those of the users dot file one. This way the project defined one always overrules the dot file one if duplicate keys are defined.

I've also updated the test to accommodate for the custom dot file. my previous patch worked as long as you had no dot file while running the tests. its now integrated with the other mocks.

Please let me know if you agree with this, and if the purpose is clear :)

Gerard

… homedir, this dotfile config will be the base config which can be extended by the project config.
@coveralls
Copy link

coveralls commented Dec 14, 2017

Coverage Status

Coverage decreased (-0.1%) to 91.716% when pulling 93ca29e on smeevil:master into 9b2bde6 on parroty:master.

@smeevil
Copy link
Contributor Author

smeevil commented Dec 14, 2017

Sorry, I was a bit to quick with testing :/ It seems there are still some edge cases to cover. Please wait for this...

@coveralls
Copy link

coveralls commented Dec 14, 2017

Coverage Status

Coverage decreased (-0.3%) to 91.545% when pulling d3acf6b on smeevil:master into 9b2bde6 on parroty:master.

@smeevil
Copy link
Contributor Author

smeevil commented Dec 14, 2017

It's now working as intended, sorry for the slipup !

@parroty parroty merged commit 3fc74f9 into parroty:master Dec 24, 2017
@parroty
Copy link
Owner

parroty commented Dec 24, 2017

Thanks!

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