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

Fixed merge conflict for original #575 fix #788

Closed
wants to merge 2 commits into from
Closed

Fixed merge conflict for original #575 fix #788

wants to merge 2 commits into from

Conversation

Lashas83
Copy link

@Lashas83 Lashas83 commented Feb 8, 2017

Fixed issue with pull request #689 which was caused by conflicting changes between parallel runner and Xunit.Abstractions.ITestOutputHelper

avonwyss and others added 2 commits November 25, 2016 15:22
@avonwyss
Resolves SpecFlowOSS#575
c1bc76c
@Lashas83
Merge remote-tracking branch 'avonwyss/fix575'
ed11109 
Conflicts:
	TechTalk.SpecFlow.Generator/UnitTestProvider/XUnit2TestGeneratorProvider.cs
@gasparnagy
Copy link
Contributor

@Lashas83 this is good!
#689 is was also on hold, because we had no tests for this new feature.
Could you please also try to add a scenario that shows how this can be used to the XUnit2Provider.feature file (inside the Specs project). I would add a step definiton (like in BindingCulture.feature) that accesses the outputhelper.

@avonwyss avonwyss mentioned this pull request Apr 5, 2017
Closed
@aptester aptester mentioned this pull request Jun 20, 2017
Merged
@SabotageAndi
Copy link
Contributor

Closed because #874 is merged.

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.
4 participants
@Lashas83 @gasparnagy @SabotageAndi @avonwyss