# HG changeset patch # User Marcin Kuzminski # Date 2010-10-20 18:11:11 # Node ID dd06bdf974c8d40b802123b9b905b5694460ad4c # Parent 8d78d79b67a39c51c73a89a04b79e261fa316a4c fixed tests, and added test for removal of repository from admin panel diff --git a/rhodecode/tests/functional/test_admin.py b/rhodecode/tests/functional/test_admin.py --- a/rhodecode/tests/functional/test_admin.py +++ b/rhodecode/tests/functional/test_admin.py @@ -5,5 +5,5 @@ class TestAdminController(TestController def test_index(self): self.log_user() response = self.app.get(url(controller='admin/admin', action='index')) - assert 'Admin dashboard - journal' in response.body,'No proper title in dashboard' + assert 'Admin journal' in response.body, 'No proper title in dashboard' # Test response... diff --git a/rhodecode/tests/functional/test_repos.py b/rhodecode/tests/functional/test_repos.py --- a/rhodecode/tests/functional/test_repos.py +++ b/rhodecode/tests/functional/test_repos.py @@ -22,7 +22,9 @@ class TestReposController(TestController print response - #test if we have a message that fork is ok + #test if we have a message for that repository + print '-' * 100 + print response.session assert '''created repository %s''' % (repo_name) in response.session['flash'][0], 'No flash message about new repo' #test if the fork was created in the database @@ -53,7 +55,46 @@ class TestReposController(TestController response = self.app.post(url('repo', repo_name='vcs_test'), params=dict(_method='put')) def test_delete(self): - response = self.app.delete(url('repo', repo_name='vcs_test')) + self.log_user() + repo_name = 'vcs_test_new_to_delete' + description = 'description for newly created repo' + private = False + response = self.app.post(url('repos'), {'repo_name':repo_name, + 'description':description, + 'private':private}) + + print response + + #test if we have a message for that repository + print '-' * 100 + print response.session + assert '''created repository %s''' % (repo_name) in response.session['flash'][0], 'No flash message about new repo' + + #test if the repo was created in the database + new_repo = self.sa.query(Repository).filter(Repository.repo_name == repo_name).one() + + assert new_repo.repo_name == repo_name, 'wrong name of repo name in db' + assert new_repo.description == description, 'wrong description' + + #test if repository is visible in the list ? + response = response.follow() + + assert repo_name in response.body, 'missing new repo from the main repos list' + + + response = self.app.delete(url('repo', repo_name=repo_name)) + + print '-' * 100 + print response.session + assert '''deleted repository %s''' % (repo_name) in response.session['flash'][0], 'No flash message about delete repo' + + response.follow() + + #check if repo was deleted from db + deleted_repo = self.sa.query(Repository).filter(Repository.repo_name == repo_name).scalar() + + assert deleted_repo is None, 'Deleted repository was found in db' + def test_delete_browser_fakeout(self): response = self.app.post(url('repo', repo_name='vcs_test'), params=dict(_method='delete'))