diff --git a/rhodecode/tests/lib/middleware/test_simplegit.py b/rhodecode/tests/lib/middleware/test_simplegit.py
--- a/rhodecode/tests/lib/middleware/test_simplegit.py
+++ b/rhodecode/tests/lib/middleware/test_simplegit.py
@@ -20,7 +20,10 @@
import pytest
import urlparse
+import mock
+import simplejson as json
+from rhodecode.lib.vcs.backends.base import Config
from rhodecode.tests.lib.middleware import mock_scm_app
import rhodecode.lib.middleware.simplegit as simplegit
@@ -107,22 +110,24 @@ def test_get_repository_name(url, expect
get_environ(url, request_method))
-def test_get_config(pylonsapp):
+def test_get_config(pylonsapp, user_util):
+ repo = user_util.create_repo(repo_type='git')
app = simplegit.SimpleGit(application=None,
config={'auth_ret_code': '', 'base_path': ''},
registry=None)
extras = {'foo': 'FOO', 'bar': 'BAR'}
# We copy the extras as the method below will change the contents.
- config = app._create_config(dict(extras), repo_name='test-repo')
+ git_config = app._create_config(dict(extras), repo_name=repo.repo_name)
+
expected_config = dict(extras)
expected_config.update({
'git_update_server_info': False,
- 'git_lfs_enabled': True,
- 'git_lfs_store_path': simplegit.default_lfs_store()
+ 'git_lfs_enabled': False,
+ 'git_lfs_store_path': git_config['git_lfs_store_path']
})
- assert config == expected_config
+ assert git_config == expected_config
def test_create_wsgi_app_uses_scm_app_from_simplevcs(pylonsapp):
diff --git a/rhodecode/tests/lib/middleware/test_simplehg.py b/rhodecode/tests/lib/middleware/test_simplehg.py
--- a/rhodecode/tests/lib/middleware/test_simplehg.py
+++ b/rhodecode/tests/lib/middleware/test_simplehg.py
@@ -78,30 +78,42 @@ def test_get_repository_name(url, expect
assert expected_repo_name == app._get_repository_name(get_environ(url))
-def test_get_config():
+def test_get_config(pylonsapp, user_util):
+ repo = user_util.create_repo(repo_type='git')
app = simplehg.SimpleHg(application=None,
config={'auth_ret_code': '', 'base_path': ''},
registry=None)
extras = {'foo': 'FOO', 'bar': 'BAR'}
- mock_config = Config()
- mock_config.set('a1', 'b1', 'c1')
- mock_config.set('a2', 'b2', 'c2')
- # We mock the call to make_db_config, otherwise we need to wait for the
- # pylonsaspp
- with mock.patch('rhodecode.lib.utils.make_db_config',
- return_value=mock_config) as make_db_config_mock:
- hg_config = app._create_config(extras, repo_name='test-repo')
+ hg_config = app._create_config(extras, repo_name=repo.repo_name)
+
+ config = simplehg.utils.make_db_config(repo=repo.repo_name)
+ config.set('rhodecode', 'RC_SCM_DATA', json.dumps(extras))
+ hg_config_org = config
- make_db_config_mock.assert_called_once_with(repo='test-repo')
- assert isinstance(hg_config, list)
-
- # Remove the entries from the mock_config so to get only the extras
- hg_config.remove(('a1', 'b1', 'c1'))
- hg_config.remove(('a2', 'b2', 'c2'))
-
- assert hg_config[0][:2] == ('rhodecode', 'RC_SCM_DATA')
- assert json.loads(hg_config[0][-1]) == extras
+ expected_config = [
+ ('vcs_svn_tag', 'ff89f8c714d135d865f44b90e5413b88de19a55f', '/tags/*'),
+ ('web', 'push_ssl', 'False'),
+ ('web', 'allow_push', '*'),
+ ('web', 'allow_archive', 'gz zip bz2'),
+ ('web', 'baseurl', '/'),
+ ('vcs_git_lfs', 'store_location', hg_config_org.get('vcs_git_lfs', 'store_location')),
+ ('vcs_svn_branch', '9aac1a38c3b8a0cdc4ae0f960a5f83332bc4fa5e', '/branches/*'),
+ ('vcs_svn_branch', 'c7e6a611c87da06529fd0dd733308481d67c71a8', '/trunk'),
+ ('largefiles', 'usercache', hg_config_org.get('largefiles', 'usercache')),
+ ('hooks', 'preoutgoing.pre_pull', 'python:vcsserver.hooks.pre_pull'),
+ ('hooks', 'prechangegroup.pre_push', 'python:vcsserver.hooks.pre_push'),
+ ('hooks', 'outgoing.pull_logger', 'python:vcsserver.hooks.log_pull_action'),
+ ('hooks', 'pretxnchangegroup.pre_push', 'python:vcsserver.hooks.pre_push'),
+ ('hooks', 'changegroup.push_logger', 'python:vcsserver.hooks.log_push_action'),
+ ('hooks', 'changegroup.repo_size', 'python:vcsserver.hooks.repo_size'),
+ ('phases', 'publish', 'True'),
+ ('extensions', 'largefiles', ''),
+ ('paths', '/', hg_config_org.get('paths', '/')),
+ ('rhodecode', 'RC_SCM_DATA', '{"foo": "FOO", "bar": "BAR"}')
+ ]
+ for entry in expected_config:
+ assert entry in hg_config
def test_create_wsgi_app_uses_scm_app_from_simplevcs():
diff --git a/rhodecode/tests/models/settings/test_vcs_settings.py b/rhodecode/tests/models/settings/test_vcs_settings.py
--- a/rhodecode/tests/models/settings/test_vcs_settings.py
+++ b/rhodecode/tests/models/settings/test_vcs_settings.py
@@ -176,7 +176,7 @@ class TestVcsSettingsModel(object):
settings_mock.get_setting_by_name.return_value = result_mock
result = model._collect_all_settings(global_=global_)
- ui_settings = model.HG_SETTINGS + model.HOOKS_SETTINGS
+ ui_settings = model.HG_SETTINGS + model.GIT_SETTINGS + model.HOOKS_SETTINGS
self._assert_get_settings_calls(
settings_mock, ui_settings, model.GENERAL_SETTINGS)
self._assert_collect_all_settings_result(
@@ -230,7 +230,13 @@ class TestVcsSettingsModel(object):
expected_result = {}
for section, key in ui_settings:
key = '{}_{}'.format(section, key.replace('.', '_'))
- value = True if section in ('extensions', 'hooks') else 'ui_value'
+
+ if section in ('extensions', 'hooks'):
+ value = True
+ elif key in ['vcs_git_lfs_enabled']:
+ value = True
+ else:
+ value = 'ui_value'
expected_result[key] = value
for name in general_settings:
@@ -599,6 +605,25 @@ class TestCreateOrUpdateGlobalHgSettings
assert exc_info.value.message == expected_message
+class TestCreateOrUpdateGlobalGitSettings(object):
+ FORM_DATA = {
+ 'vcs_git_lfs_enabled': False,
+ 'vcs_git_lfs_store_location': '/example/lfs-store',
+ }
+
+ def test_creates_repo_hg_settings_when_data_is_correct(self):
+ model = VcsSettingsModel()
+ with mock.patch.object(model, '_create_or_update_ui') as create_mock:
+ model.create_or_update_global_git_settings(self.FORM_DATA)
+ expected_calls = [
+ mock.call(model.global_settings, 'vcs_git_lfs', 'enabled',
+ active=False, value=False),
+ mock.call(model.global_settings, 'vcs_git_lfs', 'store_location',
+ value='/example/lfs-store'),
+ ]
+ assert expected_calls == create_mock.call_args_list
+
+
class TestDeleteRepoSvnPattern(object):
def test_success_when_repo_is_set(self, backend_svn):
repo_name = backend_svn.repo_name
@@ -933,6 +958,8 @@ class TestCreateOrUpdateRepoSettings(obj
'hooks_outgoing_pull_logger': False,
'extensions_largefiles': False,
'largefiles_usercache': '/example/largefiles-store',
+ 'vcs_git_lfs_enabled': False,
+ 'vcs_git_lfs_store_location': '/',
'phases_publish': 'False',
'rhodecode_pr_merge_enabled': False,
'rhodecode_use_outdated_comments': False,