diff --git a/rhodecode/tests/__init__.py b/rhodecode/tests/__init__.py --- a/rhodecode/tests/__init__.py +++ b/rhodecode/tests/__init__.py @@ -30,7 +30,7 @@ import pylons.test #SetupCommand('setup-app').run([config_file]) ##RUNNING DESIRED TESTS -#nosetests rhodecode.tests.functional.test_admin_settings:TestSettingsController.test_my_account +#nosetests -x rhodecode.tests.functional.test_admin_settings:TestSettingsController.test_my_account environ = {} diff --git a/rhodecode/tests/functional/test_admin_settings.py b/rhodecode/tests/functional/test_admin_settings.py --- a/rhodecode/tests/functional/test_admin_settings.py +++ b/rhodecode/tests/functional/test_admin_settings.py @@ -71,7 +71,7 @@ class TestAdminSettingsController(TestCo email=new_email,)) response.follow() - assert 'Your account was updated succesfully' in response.session['flash'][0][1], 'no flash message about success of change' + assert 'Your account was updated successfully' in response.session['flash'][0][1], 'no flash message about success of change' user = self.sa.query(User).filter(User.username == 'test_admin').one() assert user.email == new_email , 'incorrect user email after update got %s vs %s' % (user.email, new_email) assert user.name == new_name, 'updated field mismatch %s vs %s' % (user.name, new_name) @@ -94,7 +94,7 @@ class TestAdminSettingsController(TestCo email=old_email,)) response.follow() - assert 'Your account was updated succesfully' in response.session['flash'][0][1], 'no flash message about success of change' + assert 'Your account was updated successfully' in response.session['flash'][0][1], 'no flash message about success of change' user = self.sa.query(User).filter(User.username == 'test_admin').one() assert user.email == old_email , 'incorrect user email after update got %s vs %s' % (user.email, old_email) diff --git a/rhodecode/tests/functional/test_files.py b/rhodecode/tests/functional/test_files.py --- a/rhodecode/tests/functional/test_files.py +++ b/rhodecode/tests/functional/test_files.py @@ -74,7 +74,7 @@ class TestFilesController(TestController f_path='vcs/nodes.py')) #test or history - assert """""" in response.body + + + + + + + + + + + + +""" in response.body assert """
"Partially implemented #16. filecontent/commit message/author/node name are safe_unicode now. @@ -126,8 +138,9 @@ removed extra unicode conversion in diff revision='27cd5cce30c96924232dffcd24178a07ffeb5dfc', f_path='vcs/nodes.py')) - - assert """ + print response.body + assert """ + @@ -160,6 +173,18 @@ removed extra unicode conversion in diff -""" in response.body, 'missing history in annotation' + + + + + + + + + + + + +""" in response.body, 'missing or wrong history in annotation' assert """branch: default""" in response.body, 'missing or wrong branch info' diff --git a/rhodecode/tests/functional/test_summary.py b/rhodecode/tests/functional/test_summary.py --- a/rhodecode/tests/functional/test_summary.py +++ b/rhodecode/tests/functional/test_summary.py @@ -11,7 +11,9 @@ class TestSummaryController(TestControll assert """public repository""" in response.body #codes stats - assert """var data = {"text/x-python": 42, "text/plain": 12};""" in response.body, 'wrong info about % of codes stats' + assert """var data = {"Python": 42, "Rst": 11, "Bash": 2, "Makefile": 1, "Batch": 1, "Ini": 1, "Css": 1};""" in response.body, 'wrong info about % of codes stats' # clone url... assert """""" % HG_REPO in response.body + +