A few fixes + increased robustness of tests #127
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
By default the tests run on a mock merge request with the same source and target project. This leaves us without much coverage for cases where we want to merge as a fork. This change also restructures the tests to make better use of fixtures, as this make's writing the code to test both types of merge request easier. Finally, we make sure that all mocks used have `autospec` set so that we don't accidentally miss bugs where wrong methods are called, or wrong arguments are passed.
This is now caught by the tests. Fixes: #122
Handle the case where GitLab skips CI (due to a `[ci skip]` present in the commit message. Also add some tests for CI being canceled/failed. Fixes: #95
When rewriting commits, we need to push the updates to the original branch. If the branch is protected, then Marge will be unable to do so, and should return an appropriate error message. Fixes: #128
Fixes an issue uncovered by #124 where Marge throws an assertion error if the source/target branches are from the same project and the source branch is master. We assume that merges will always be into master, which is obviously not always the case; you may have a workflow requiring you to merge from master into another branch (e.g. a staging/production branch).
aschmolck
approved these changes
Oct 1, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix a few issues, and increases the robustness of the tests by providing specs for mocks. Details are available in individual commit messages.