fix(auto-merge): fixed tests.

rhodecode/apps/repository/tests/test_repo_vcs_settings.py

@@ -44,7 +44,6 @@ class TestVcsSettings(object):
         "extensions_evolve": False,
         "phases_publish": "False",
         "rhodecode_pr_merge_enabled": False,
-        "rhodecode_auto_merge_enabled": False,
         "rhodecode_use_outdated_comments": False,
         "new_svn_branch": "",
         "new_svn_tag": "",
@@ -58,7 +57,6 @@ class TestVcsSettings(object):
         expected_settings = (
             "rhodecode_use_outdated_comments",
             "rhodecode_pr_merge_enabled",
-            "rhodecode_auto_merge_enabled",
             "hooks_changegroup_repo_size",
             "hooks_changegroup_push_logger",
             "hooks_outgoing_pull_logger",

rhodecode/tests/models/settings/test_settings.py

@@ -533,7 +533,7 @@ class TestGlobalGetAllSettings(object):
         ]
         model = SettingsModel()
 
-        settings = model.get_all_settings()
+        settings = model.get_all_settings(from_request=False)
         expected_settings = {"rhodecode_" + name: initial_settings[name] for name in initial_settings}
 
         filtered_settings = {name: settings[name] for name in settings if name.startswith("rhodecode_test_setting")}

rhodecode/tests/models/test_comment.py

@@ -127,6 +127,9 @@ def assert_inline_comments_order(query):
     assert str(order_by[0]) == "changeset_comments.comment_id ASC"
 
 
+@pytest.mark.skip(
+    reason="we're using now get_current_request from pyramid_utils so we'll not get a predefined global_renderer"
+)
 def test_get_renderer():
     model = comment.CommentsModel()
     renderer = model._get_renderer()