Partially implemented #16. filecontent/commit message/author/node name are safe_unicode now. + response.mustcontain("""

Partially implemented #16. filecontent/commit message/author/node name are safe_unicode now. In addition some other __str__ are unicode as well Added test for unicode Improved test to clone into uniq repository. diff --git a/kallithea/tests/functional/test_login.py b/kallithea/tests/functional/test_login.py --- a/kallithea/tests/functional/test_login.py +++ b/kallithea/tests/functional/test_login.py @@ -103,8 +103,8 @@ class TestLoginController(TestController ('data:text/html,',), ('mailto:test@example.com',), ('file:///etc/passwd',), - ('ftp://some.ftp.server',), - ('http://other.domain/bl%C3%A5b%C3%A6rgr%C3%B8d',), + ('ftp://ftp.example.com',), + ('http://other.example.com/bl%C3%A5b%C3%A6rgr%C3%B8d',), ]) def test_login_bad_came_froms(self, url_came_from): response = self.app.post(url(controller='login', action='index', @@ -205,7 +205,7 @@ class TestLoginController(TestController {'username': uname, 'password': 'test12', 'password_confirmation': 'test12', - 'email': 'goodmail@domain.com', + 'email': 'goodmail@example.com', 'firstname': 'test', 'lastname': 'test'}) @@ -304,7 +304,7 @@ class TestLoginController(TestController def test_register_ok(self): username = 'test_regular4' password = 'qweqwe' - email = 'username@test.com' + email = 'user4@example.com' name = 'testname' lastname = 'testlastname' @@ -348,7 +348,7 @@ class TestLoginController(TestController username = 'test_password_reset_1' password = 'qweqwe' - email = 'username@python-works.com' + email = 'username@example.com' name = 'passwd' lastname = 'reset' timestamp = int(time.time()) diff --git a/kallithea/tests/functional/test_my_account.py b/kallithea/tests/functional/test_my_account.py --- a/kallithea/tests/functional/test_my_account.py +++ b/kallithea/tests/functional/test_my_account.py @@ -67,16 +67,16 @@ class TestMyAccountController(TestContro response.mustcontain('No additional emails specified') response = self.app.post(url('my_account_emails'), - {'new_email': 'foo@barz.com', '_authentication_token': self.authentication_token()}) + {'new_email': 'barz@example.com', '_authentication_token': self.authentication_token()}) response = self.app.get(url('my_account_emails')) from kallithea.model.db import UserEmailMap email_id = UserEmailMap.query()\ .filter(UserEmailMap.user == User.get_by_username(TEST_USER_ADMIN_LOGIN))\ - .filter(UserEmailMap.email == 'foo@barz.com').one().email_id + .filter(UserEmailMap.email == 'barz@example.com').one().email_id - response.mustcontain('foo@barz.com') + response.mustcontain('barz@example.com') response.mustcontain('' % email_id) response = self.app.post(url('my_account_emails'), @@ -97,7 +97,7 @@ class TestMyAccountController(TestContro #('extern_name', {'extern_name': None}), ('active', {'active': False}), ('active', {'active': True}), - ('email', {'email': 'some@email.com'}), + ('email', {'email': 'someemail@example.com'}), # ('new_password', {'new_password': 'foobar123', # 'password_confirmation': 'foobar123'}) ]) diff --git a/kallithea/tests/other/manual_test_vcs_operations.py b/kallithea/tests/other/manual_test_vcs_operations.py --- a/kallithea/tests/other/manual_test_vcs_operations.py +++ b/kallithea/tests/other/manual_test_vcs_operations.py @@ -112,13 +112,13 @@ def _add_files_and_push(vcs, DEST, **kwa for i in xrange(kwargs.get('files_no', 3)): cmd = """echo 'added_line%s' >> %s""" % (i, added_file) Command(cwd).execute(cmd) - author_str = 'User ǝɯɐᴎ ' + author_str = 'User ǝɯɐᴎ ' if vcs == 'hg': cmd = """hg commit -m 'commited new %s' -u '%s' %s """ % ( i, author_str, added_file ) elif vcs == 'git': - cmd = """EMAIL="me@email.com" git commit -m 'commited new %s' --author '%s' %s """ % ( + cmd = """EMAIL="me@example.com" git commit -m 'commited new %s' --author '%s' %s """ % ( i, author_str, added_file ) Command(cwd).execute(cmd) diff --git a/kallithea/tests/other/test_libs.py b/kallithea/tests/other/test_libs.py --- a/kallithea/tests/other/test_libs.py +++ b/kallithea/tests/other/test_libs.py @@ -42,11 +42,11 @@ TEST_URLS = [ '%s://127.0.0.1' % proto), ('%s://127.0.0.1:8080' % proto, ['%s://' % proto, '127.0.0.1', '8080'], '%s://127.0.0.1:8080' % proto), - ('%s://domain.org' % proto, ['%s://' % proto, 'domain.org'], - '%s://domain.org' % proto), - ('%s://user:pass@domain.org:8080' % proto, ['%s://' % proto, 'domain.org', + ('%s://example.com' % proto, ['%s://' % proto, 'example.com'], + '%s://example.com' % proto), + ('%s://user:pass@example.com:8080' % proto, ['%s://' % proto, 'example.com', '8080'], - '%s://domain.org:8080' % proto), + '%s://example.com:8080' % proto), ] proto = 'https' @@ -59,11 +59,11 @@ TEST_URLS += [ '%s://127.0.0.1' % proto), ('%s://127.0.0.1:8080' % proto, ['%s://' % proto, '127.0.0.1', '8080'], '%s://127.0.0.1:8080' % proto), - ('%s://domain.org' % proto, ['%s://' % proto, 'domain.org'], - '%s://domain.org' % proto), - ('%s://user:pass@domain.org:8080' % proto, ['%s://' % proto, 'domain.org', + ('%s://example.com' % proto, ['%s://' % proto, 'example.com'], + '%s://example.com' % proto), + ('%s://user:pass@example.com:8080' % proto, ['%s://' % proto, 'example.com', '8080'], - '%s://domain.org:8080' % proto), + '%s://example.com:8080' % proto), ] @@ -104,11 +104,11 @@ class TestLibs(BaseTestCase): def test_mention_extractor(self): from kallithea.lib.utils2 import extract_mentioned_users sample = ( - "@first hi there @world here's my email username@email.com " + "@first hi there @world here's my email username@example.com " "@lukaszb check @one_more22 it pls @ ttwelve @D[] @one@two@three " "@UPPER @cAmEL @2one_more22 @john please see this http://org.pl " "@marian.user just do it @marco-polo and next extract @marco_polo " - "user.dot hej ! not-needed maril@domain.org" + "user.dot hej ! not-needed maril@example.com" ) s = sorted([ @@ -184,7 +184,7 @@ class TestLibs(BaseTestCase): def test_tag_exctrator(self): sample = ( "hello pta[tag] gog [[]] [[] sda ero[or]d [me =>>< sa]" - "[requires] [stale] [see<>=>] [see => http://url.com]" + "[requires] [stale] [see<>=>] [see => http://example.com]" "[requires => url] [lang => python] [just a tag]" "[,d] [ => ULR ] [obsolete] [desc]]" ) @@ -205,7 +205,7 @@ class TestLibs(BaseTestCase): class fake_url(object): @classmethod def current(cls, *args, **kwargs): - return 'https://server.com' + return 'https://example.com' #mock pylons.tmpl_context def fake_tmpl_context(_url): @@ -218,35 +218,35 @@ class TestLibs(BaseTestCase): with mock.patch('pylons.url', fake_url): - fake = fake_tmpl_context(_url='http://test.com/{email}') + fake = fake_tmpl_context(_url='http://example.com/{email}') with mock.patch('pylons.tmpl_context', fake): from pylons import url - assert url.current() == 'https://server.com' - grav = gravatar_url(email_address='test@foo.com', size=24) - assert grav == 'http://test.com/test@foo.com' + assert url.current() == 'https://example.com' + grav = gravatar_url(email_address='test@example.com', size=24) + assert grav == 'http://example.com/test@example.com' - fake = fake_tmpl_context(_url='http://test.com/{email}') + fake = fake_tmpl_context(_url='http://example.com/{email}') with mock.patch('pylons.tmpl_context', fake): - grav = gravatar_url(email_address='test@foo.com', size=24) - assert grav == 'http://test.com/test@foo.com' + grav = gravatar_url(email_address='test@example.com', size=24) + assert grav == 'http://example.com/test@example.com' - fake = fake_tmpl_context(_url='http://test.com/{md5email}') + fake = fake_tmpl_context(_url='http://example.com/{md5email}') with mock.patch('pylons.tmpl_context', fake): - em = 'test@foo.com' + em = 'test@example.com' grav = gravatar_url(email_address=em, size=24) - assert grav == 'http://test.com/%s' % (_md5(em)) + assert grav == 'http://example.com/%s' % (_md5(em)) - fake = fake_tmpl_context(_url='http://test.com/{md5email}/{size}') + fake = fake_tmpl_context(_url='http://example.com/{md5email}/{size}') with mock.patch('pylons.tmpl_context', fake): - em = 'test@foo.com' + em = 'test@example.com' grav = gravatar_url(email_address=em, size=24) - assert grav == 'http://test.com/%s/%s' % (_md5(em), 24) + assert grav == 'http://example.com/%s/%s' % (_md5(em), 24) fake = fake_tmpl_context(_url='{scheme}://{netloc}/{md5email}/{size}') with mock.patch('pylons.tmpl_context', fake): - em = 'test@foo.com' + em = 'test@example.com' grav = gravatar_url(email_address=em, size=24) - assert grav == 'https://server.com/%s/%s' % (_md5(em), 24) + assert grav == 'https://example.com/%s/%s' % (_md5(em), 24) @parameterized.expand([ (Repository.DEFAULT_CLONE_URI, 'group/repo1', {}, '', 'http://vps1:8000/group/repo1'), @@ -260,9 +260,9 @@ class TestLibs(BaseTestCase): ('{scheme}://{user}@{netloc}/_{repoid}', 'group/repo1', {'user': 'username'}, '', 'http://username@vps1:8000/_23'), ('http://{user}@{netloc}/_{repoid}', 'group/repo1', {'user': 'username'}, '', 'http://username@vps1:8000/_23'), ('http://{netloc}/_{repoid}', 'group/repo1', {'user': 'username'}, '', 'http://vps1:8000/_23'), - ('https://{user}@proxy1.server.com/{repo}', 'group/repo1', {'user': 'username'}, '', 'https://username@proxy1.server.com/group/repo1'), - ('https://{user}@proxy1.server.com/{repo}', 'group/repo1', {}, '', 'https://proxy1.server.com/group/repo1'), - ('https://proxy1.server.com/{user}/{repo}', 'group/repo1', {'user': 'username'}, '', 'https://proxy1.server.com/username/group/repo1'), + ('https://{user}@proxy1.example.com/{repo}', 'group/repo1', {'user': 'username'}, '', 'https://username@proxy1.example.com/group/repo1'), + ('https://{user}@proxy1.example.com/{repo}', 'group/repo1', {}, '', 'https://proxy1.example.com/group/repo1'), + ('https://proxy1.example.com/{user}/{repo}', 'group/repo1', {'user': 'username'}, '', 'https://proxy1.example.com/username/group/repo1'), ]) def test_clone_url_generator(self, tmpl, repo_name, overrides, prefix, expected): from kallithea.lib.utils2 import get_clone_url @@ -337,12 +337,12 @@ class TestLibs(BaseTestCase): "from rev a also rev url[http://google.com]", "http://google.com"), ("""Multi line - https://foo.bar.com + https://foo.bar.example.com some text lalala""", """Multi line - url[https://foo.bar.com] + url[https://foo.bar.example.com] some text lalala""", - "https://foo.bar.com") + "https://foo.bar.example.com") ]) def test_urlify_test(self, sample, expected, url_): from kallithea.lib.helpers import urlify_text diff --git a/kallithea/tests/scripts/manual_test_concurrency.py b/kallithea/tests/scripts/manual_test_concurrency.py --- a/kallithea/tests/scripts/manual_test_concurrency.py +++ b/kallithea/tests/scripts/manual_test_concurrency.py @@ -107,7 +107,7 @@ def create_test_user(force=True): new_usr = User() new_usr.username = USER new_usr.password = get_crypt_password(PASS) - new_usr.email = 'mail@mail.com' + new_usr.email = 'mail@example.com' new_usr.name = 'test' new_usr.lastname = 'lasttestname' new_usr.active = True diff --git a/kallithea/tests/test.ini b/kallithea/tests/test.ini --- a/kallithea/tests/test.ini +++ b/kallithea/tests/test.ini @@ -56,7 +56,7 @@ pdebug = false ## SMTP server settings ## Only smtp_server is mandatory. All other settings take the specified default ## values. -#smtp_server = mail.server.com +#smtp_server = smtp.example.com #smtp_username = #smtp_password = #smtp_port = 25 @@ -228,8 +228,8 @@ show_revision_number = true ## gist URL alias, used to create nicer urls for gist. This should be an ## url that does rewrites to _admin/gists/. -## example: http://gist.kallithea.server/{gistid}. Empty means use the internal -## Kallithea url, ie. http[s]://your.kallithea.server/_admin/gists/ +## example: http://gist.example.com/{gistid}. Empty means use the internal +## Kallithea url, ie. http[s]://kallithea.example.com/_admin/gists/ gist_alias_url = ## white list of API enabled controllers. This allows to add list of @@ -264,7 +264,7 @@ issue_pat = (?:\s*#)(\d+) ## fetched from the regex and {repo} is replaced with full repository name ## including groups {repo_name} is replaced with just name of repo -issue_server_link = https://myissueserver.com/{repo}/issue/{id} +issue_server_link = https://issues.example.com/{repo}/issue/{id} ## prefix to add to link to indicate it's an url ## #314 will be replaced by @@ -274,10 +274,10 @@ issue_prefix = # ## issue_pat, issue_server_link, issue_prefix can have suffixes to specify ## multiple patterns, to other issues server, wiki or others ## below an example how to create a wiki pattern -# wiki-some-id -> https://mywiki.com/some-id +# wiki-some-id -> https://wiki.example.com/some-id #issue_pat_wiki = (?:wiki-)(.+) -#issue_server_link_wiki = https://mywiki.com/{id} +#issue_server_link_wiki = https://wiki.example.com/{id} #issue_prefix_wiki = WIKI- ## instance-id prefix diff --git a/kallithea/tests/vcs/test_utils.py b/kallithea/tests/vcs/test_utils.py --- a/kallithea/tests/vcs/test_utils.py +++ b/kallithea/tests/vcs/test_utils.py @@ -184,26 +184,26 @@ class TestParseDatetime(unittest.TestCas class TestAuthorExtractors(unittest.TestCase): - TEST_AUTHORS = [("Username Last'o'Name ", - ("Username Last'o'Name", "username@python-works.com")), - ("Username Last'o'Name Spaces < username@python-works.com >", - ("Username Last'o'Name Spaces", "username@python-works.com")), - ("Username Last'o'Name ", - ("Username Last'o'Name", "username.lastname@python-works.com")), - ('mrf RFC_SPEC ', - ('mrf RFC_SPEC', 'username+lastname@python-works.com')), - ('username ', - ('username', 'user@email.com')), - ('username ', - ('', 'justemail@mail.com')), + TEST_AUTHORS = [("Username Last'o'Name ", + ("Username Last'o'Name", "username@example.com")), + ("Username Last'o'Name Spaces < username@example.com >", + ("Username Last'o'Name Spaces", "username@example.com")), + ("Username Last'o'Name ", + ("Username Last'o'Name", "username.lastname@example.com")), + ('mrf RFC_SPEC ', + ('mrf RFC_SPEC', 'username+lastname@example.com')), + ('username ', + ('username', 'user@example.com')), + ('username ', + ('', 'justemail@example.com')), ('justname', ('justname', '')), - ('Mr Double Name withemail@email.com ', - ('Mr Double Name', 'withemail@email.com')), + ('Mr Double Name withemail@example.com ', + ('Mr Double Name', 'withemail@example.com')), ] def test_author_email(self):