diff --git a/config/github.yml b/config/github.yml index 48120d7..59d770d 100644 --- a/config/github.yml +++ b/config/github.yml @@ -1,6 +1,5 @@ config: hasWikiEnabled: false - autoMergeAllowed: true deleteBranchOnMerge: true mergeCommitAllowed: false rebaseMergeAllowed: false diff --git a/test/test_github_config.py b/test/test_github_config.py index 2c5c9a9..82d2720 100644 --- a/test/test_github_config.py +++ b/test/test_github_config.py @@ -18,7 +18,7 @@ class GitHubConfigTest(unittest.TestCase): def setUp(self): self.checks = { "hasWikiEnabled": False, - "autoMergeAllowed": True, + "deleteBranchOnMerge": True, } def test_loads_repository_config(self): @@ -28,7 +28,6 @@ def test_loads_repository_config(self): set(checks), { "hasWikiEnabled", - "autoMergeAllowed", "deleteBranchOnMerge", "mergeCommitAllowed", "rebaseMergeAllowed", @@ -109,12 +108,12 @@ def test_evaluates_checks_and_reuses_api_response(self): def request(repository, fields): requests.append((repository, fields)) - return {"hasWikiEnabled": False, "autoMergeAllowed": True} + return {"hasWikiEnabled": False, "deleteBranchOnMerge": True} results = CHECK_GITHUB_CONFIG.evaluate_checks(self.checks, "owner/repo", request=request) self.assertEqual([result.status for result in results], ["passed", "passed"]) - self.assertEqual(requests, [("owner/repo", ["hasWikiEnabled", "autoMergeAllowed"])]) + self.assertEqual(requests, [("owner/repo", ["hasWikiEnabled", "deleteBranchOnMerge"])]) def test_skips_check_without_requesting_it(self): results = CHECK_GITHUB_CONFIG.evaluate_checks( @@ -130,12 +129,12 @@ def test_aggregates_mismatches(self): results = CHECK_GITHUB_CONFIG.evaluate_checks( self.checks, "owner/repo", - request=lambda _repository, _fields: {"hasWikiEnabled": True, "autoMergeAllowed": False}, + request=lambda _repository, _fields: {"hasWikiEnabled": True, "deleteBranchOnMerge": False}, ) self.assertEqual( [result.name for result in results if result.status == "failed"], - ["hasWikiEnabled", "autoMergeAllowed"], + ["hasWikiEnabled", "deleteBranchOnMerge"], ) def test_reports_api_failure_for_each_dependent_check(self):