diff --git a/rhodecode/tests/models/settings/test_vcs_settings.py b/rhodecode/tests/models/settings/test_vcs_settings.py index 16933039..1e2ae711 100644 --- a/rhodecode/tests/models/settings/test_vcs_settings.py +++ b/rhodecode/tests/models/settings/test_vcs_settings.py @@ -43,6 +43,7 @@ GENERAL_FORM_DATA = { "rhodecode_git_close_branch_before_merging": True, "rhodecode_git_merge_strategy_selector": True, "rhodecode_diff_cache": True, + "rhodecode_pr_target_branch_prepopulate": True, } @@ -951,10 +952,19 @@ class TestCreateOrUpdateRepoSettings(object): "extensions_largefiles": False, "extensions_evolve": False, "vcs_git_lfs_enabled": False, + "vcs_git_default_branch": "main", "phases_publish": "False", "rhodecode_pr_merge_enabled": False, "rhodecode_auto_merge_enabled": False, "rhodecode_use_outdated_comments": False, + "rhodecode_hg_use_rebase_for_merging": False, + "rhodecode_hg_close_branch_before_merging": False, + "rhodecode_hg_merge_strategy_selector": False, + "rhodecode_git_use_rebase_for_merging": False, + "rhodecode_git_close_branch_before_merging": False, + "rhodecode_git_merge_strategy_selector": False, + "rhodecode_diff_cache": False, + "rhodecode_pr_target_branch_prepopulate": False, "new_svn_branch": "", "new_svn_tag": "", }