Add unit tests for on_merge_conflict logic

[sweep-nightly[bot]]

PR Feedback (click)

• [ ] 👍 Sweep Did Well
• [ ] 👎 Sweep Needs Improvement

I created this PR to address this rule:

"All new business logic should have corresponding unit tests in the same directory. For example, sweepai/api_test.py tests sweepai/api.py. Use unittest and unittest.mock as required."

Description

This PR introduces comprehensive unit tests for the on_merge_conflict function located in sweepai/handlers/on_merge_conflict.py. The tests cover various scenarios, including successful conflict resolution, handling of exceptions when interacting with the GitHub API, and correct application of Git configuration settings during the merge conflict resolution process.

The new test suite ensures that the business logic within the on_merge_conflict function behaves as expected and that all code paths, including error handling, are properly tested. Mocking is extensively used to isolate the function from external dependencies, allowing us to verify the internal logic without actual calls to GitHub or Git.

Summary

• Created a new file sweepai/handlers/on_merge_conflict_test.py for unit tests.
• Added a test class TestOnMergeConflict with multiple test methods to cover different scenarios.
• Mocked external dependencies such as GitHub client and Git operations using unittest.mock.
• Tested both the successful execution path and exception handling within the on_merge_conflict function.
• Ensured that Git configuration settings are correctly applied during the merge conflict resolution process.

[sweep-nightly[bot]]

Rollback Files For Sweep

• [ ] Rollback changes to sweepai/handlers/on_merge_conflict_test.py

[vercel[bot]]

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
sweep-docs	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jan 12, 2024 9:02pm