tests: fixes existing tests; adds tests for forks detach\delete
This commit is contained in:
parent
bf64faedba
commit
91a731620e
5 changed files with 64 additions and 12 deletions
|
|
@ -21,7 +21,8 @@ from unittest.mock import patch, MagicMock
|
|||
from rhodecode.apps.repository.views.repo_settings_advanced import RepoSettingsAdvancedView
|
||||
from rhodecode.lib.str_utils import safe_str
|
||||
from rhodecode.model.db import Repository
|
||||
from rhodecode.model.repo import RepoModel
|
||||
from rhodecode.model.meta import Session
|
||||
from rhodecode.model.repo import RepoModel, ForksAction
|
||||
from rhodecode.tests import HG_REPO, GIT_REPO, assert_session_flash, no_newline_id_generator
|
||||
from rhodecode.tests.fixtures.rc_fixture import Fixture
|
||||
from rhodecode.tests.utils import repo_on_filesystem
|
||||
|
|
@ -61,7 +62,7 @@ class TestAdminRepoSettingsAdvanced(object):
|
|||
|
||||
response.mustcontain(opt)
|
||||
|
||||
fixture.destroy_repo(target_repo, forks="detach")
|
||||
fixture.destroy_repo(target_repo, forks_action=ForksAction.DETACH)
|
||||
|
||||
@pytest.mark.backends("hg", "git")
|
||||
def test_set_fork_of_other_type_repo(self, autologin_user, backend, csrf_token):
|
||||
|
|
@ -97,7 +98,10 @@ class TestAdminRepoSettingsAdvanced(object):
|
|||
|
||||
@pytest.mark.parametrize("suffix", ["", "ąęł", "123"], ids=no_newline_id_generator)
|
||||
def test_advanced_repo_delete(self, autologin_user, backend, suffix, csrf_token):
|
||||
repo = backend.create_repo(name_suffix=suffix)
|
||||
repo = backend.create_repo(name_suffix=suffix, private_repo=True)
|
||||
repo.private = True
|
||||
Session().commit()
|
||||
|
||||
repo_name = repo.repo_name
|
||||
repo_name_str = safe_str(repo.repo_name)
|
||||
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ class RepoSettingsAdvancedView(RepoAppView):
|
|||
fork_action = delete_res.fork_action_result.action
|
||||
fork_cnt = delete_res.fork_action_result.fork_count
|
||||
|
||||
if fork_action is not None:
|
||||
if fork_cnt > 0 and fork_action is not None:
|
||||
if fork_action is ForksAction.DETACH:
|
||||
h.flash(_("Detached %s forks") % fork_cnt, category="success")
|
||||
elif fork_action is ForksAction.DELETE:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue