Add context for merging potentially conflicting LDAP tests (issues #61 & #62) #63
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
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.
This commit creates an rspec context into which the spec tests for my fixes for issues #61 and #62 will go. I was attempting to make it possible to merge for fixes without conflicts, but I was not wholly successful. At any rate, this is a pre-requisite for the LDAP pull requests #64 and #65.
Note that even with this, #64 and #65 will have conflicts that will have to be managed manually. If you'd like, I can submit another PR that merges both, although it should be fairly obvious how to resolve the conflict.