Skip to content

Refactoring of AsyncFunctionAssertions and ActionAssertions#1054

Merged
dennisdoomen merged 7 commits intofluentassertions:masterfrom
davidomid:issue#1053
May 31, 2019
Merged

Refactoring of AsyncFunctionAssertions and ActionAssertions#1054
dennisdoomen merged 7 commits intofluentassertions:masterfrom
davidomid:issue#1053

Conversation

@davidomid
Copy link
Copy Markdown
Contributor

@davidomid davidomid commented May 27, 2019

Resolves issue #1053

This PR also contains the changes made in PR #1050

@davidomid davidomid changed the title Issue#1053 Fix for issue #1053 (refactoring of AsyncFunctionAssertions and ActionAssertions) May 27, 2019
@dennisdoomen
Copy link
Copy Markdown
Member

Should we finish/merge #1050 first?

@davidomid
Copy link
Copy Markdown
Contributor Author

Should we finish/merge #1050 first?

Yes please :)

As far as I can tell, it should be fine for you to merge it when ready.

Thanks very much

@davidomid
Copy link
Copy Markdown
Contributor Author

Should we finish/merge #1050 first?

@dennisdoomen I resolved the merge conflicts. Looks good aside from a flaky time-related test now 👍

@dennisdoomen
Copy link
Copy Markdown
Member

You need to rebase it on master, because I still see the changes from #1050.

@jnyrup jnyrup requested a review from dennisdoomen May 31, 2019 05:29
@dennisdoomen dennisdoomen changed the title Fix for issue #1053 (refactoring of AsyncFunctionAssertions and ActionAssertions) Refactoring of AsyncFunctionAssertions and ActionAssertions May 31, 2019
@davidomid
Copy link
Copy Markdown
Contributor Author

@jnyrup @dennisdoomen

Please can this be merged? I frequently need to resolve conflicts due to the moving of methods which are edited in other merged pull requests.

Failing tests are the flaky ones again.

Thanks :)

@dennisdoomen dennisdoomen merged commit 47e6d94 into fluentassertions:master May 31, 2019
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