Mercurial > kallithea
changeset 4183:da3c57422ee6 kallithea-2.2.5-rebrand
Change domain used for email addresses in tests
| author | Bradley M. Kuhn <bkuhn@sfconservancy.org> |
|---|---|
| date | Wed, 02 Jul 2014 19:03:55 -0400 |
| parents | 05cabd91f7c3 |
| children | 48ad84558fb4 |
| files | rhodecode/tests/api/api_base.py rhodecode/tests/fixture.py rhodecode/tests/functional/test_admin_notifications.py rhodecode/tests/functional/test_admin_users.py rhodecode/tests/functional/test_forks.py rhodecode/tests/functional/test_login.py rhodecode/tests/functional/test_my_account.py rhodecode/tests/models/common.py rhodecode/tests/models/test_notifications.py rhodecode/tests/models/test_permissions.py rhodecode/tests/models/test_users.py rhodecode/tests/scripts/create_rc.sh |
| diffstat | 12 files changed, 33 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/tests/api/api_base.py Wed Jul 02 19:03:53 2014 -0400 +++ b/rhodecode/tests/api/api_base.py Wed Jul 02 19:03:55 2014 -0400 @@ -99,7 +99,7 @@ cls.test_user = UserModel().create_or_update( username='test-api', password='test', - email='test@api.rhodecode.org', + email='test@example.com', firstname='first', lastname='last' ) @@ -649,7 +649,7 @@ def test_api_delete_user(self): usr = UserModel().create_or_update(username=u'test_user', password=u'qweqwe', - email=u'u232@rhodecode.org', + email=u'u232@example.com', firstname=u'u1', lastname=u'u1') Session().commit() username = usr.username @@ -670,7 +670,7 @@ def test_api_delete_user_when_exception_happened(self): usr = UserModel().create_or_update(username=u'test_user', password=u'qweqwe', - email=u'u232@rhodecode.org', + email=u'u232@example.com', firstname=u'u1', lastname=u'u1') Session().commit() username = usr.username
--- a/rhodecode/tests/fixture.py Wed Jul 02 19:03:53 2014 -0400 +++ b/rhodecode/tests/fixture.py Wed Jul 02 19:03:55 2014 -0400 @@ -105,7 +105,7 @@ defs = dict( username=name, password='qweqwe', - email='%s+test@rhodecode.org' % name, + email='%s+test@example.com' % name, firstname='TestUser', lastname='Test', active=True,
--- a/rhodecode/tests/functional/test_admin_notifications.py Wed Jul 02 19:03:53 2014 -0400 +++ b/rhodecode/tests/functional/test_admin_notifications.py Wed Jul 02 19:03:55 2014 -0400 @@ -18,7 +18,7 @@ self.log_user() u1 = UserModel().create_or_update(username='u1', password='qweqwe', - email='u1@rhodecode.org', + email='u1@example.com', firstname='u1', lastname='u1') u1 = u1.user_id @@ -37,10 +37,10 @@ cur_user = self._get_logged_user() u1 = UserModel().create_or_update(username='u1', password='qweqwe', - email='u1@rhodecode.org', + email='u1@example.com', firstname='u1', lastname='u1') u2 = UserModel().create_or_update(username='u2', password='qweqwe', - email='u2@rhodecode.org', + email='u2@example.com', firstname='u2', lastname='u2') # make notifications @@ -71,10 +71,10 @@ self.log_user() cur_user = self._get_logged_user() u1 = UserModel().create_or_update(username='u1', password='qweqwe', - email='u1@rhodecode.org', + email='u1@example.com', firstname='u1', lastname='u1') u2 = UserModel().create_or_update(username='u2', password='qweqwe', - email='u2@rhodecode.org', + email='u2@example.com', firstname='u2', lastname='u2') subject = u'test'
--- a/rhodecode/tests/functional/test_admin_users.py Wed Jul 02 19:03:53 2014 -0400 +++ b/rhodecode/tests/functional/test_admin_users.py Wed Jul 02 19:03:55 2014 -0400 @@ -123,7 +123,7 @@ def test_update(self, name, attrs): self.log_user() usr = fixture.create_user(self.test_user_1, password='qweqwe', - email='testme@rhodecode.org', + email='testme@example.com', extern_type='rhodecode', extern_name=self.test_user_1, skip_if_exists=True)
--- a/rhodecode/tests/functional/test_forks.py Wed Jul 02 19:03:53 2014 -0400 +++ b/rhodecode/tests/functional/test_forks.py Wed Jul 02 19:03:55 2014 -0400 @@ -33,7 +33,7 @@ self.username = u'forkuser' self.password = u'qweqwe' self.u1 = fixture.create_user(self.username, password=self.password, - email=u'fork_king@rhodecode.org') + email=u'fork_king@example.com') Session().commit() def tearDown(self):
--- a/rhodecode/tests/functional/test_login.py Wed Jul 02 19:03:53 2014 -0400 +++ b/rhodecode/tests/functional/test_login.py Wed Jul 02 19:03:55 2014 -0400 @@ -63,7 +63,7 @@ @parameterized.expand([ ('data:text/html,<script>window.alert("xss")</script>',), - ('mailto:test@rhodecode.org',), + ('mailto:test@example.com',), ('file:///etc/passwd',), ('ftp://some.ftp.server',), ('http://other.domain',),
--- a/rhodecode/tests/functional/test_my_account.py Wed Jul 02 19:03:53 2014 -0400 +++ b/rhodecode/tests/functional/test_my_account.py Wed Jul 02 19:03:55 2014 -0400 @@ -108,7 +108,7 @@ ]) def test_my_account_update(self, name, attrs): usr = fixture.create_user(self.test_user_1, password='qweqwe', - email='testme@rhodecode.org', + email='testme@example.com', extern_type='rhodecode', extern_name=self.test_user_1, skip_if_exists=True)
--- a/rhodecode/tests/models/common.py Wed Jul 02 19:03:53 2014 -0400 +++ b/rhodecode/tests/models/common.py Wed Jul 02 19:03:55 2014 -0400 @@ -54,7 +54,7 @@ """ test_u1 = UserModel().create_or_update( username=u'test_u1', password=u'qweqwe', - email=u'test_u1@rhodecode.org', firstname=u'test_u1', lastname=u'test_u1' + email=u'test_u1@example.com', firstname=u'test_u1', lastname=u'test_u1' ) g0 = fixture.create_repo_group('g0') g0_1 = fixture.create_repo_group('g0_1', group_parent_id=g0)
--- a/rhodecode/tests/models/test_notifications.py Wed Jul 02 19:03:53 2014 -0400 +++ b/rhodecode/tests/models/test_notifications.py Wed Jul 02 19:03:55 2014 -0400 @@ -13,21 +13,21 @@ Session.remove() self.u1 = UserModel().create_or_update(username=u'u1', password=u'qweqwe', - email=u'u1@rhodecode.org', + email=u'u1@example.com', firstname=u'u1', lastname=u'u1') Session().commit() self.u1 = self.u1.user_id self.u2 = UserModel().create_or_update(username=u'u2', password=u'qweqwe', - email=u'u2@rhodecode.org', + email=u'u2@example.com', firstname=u'u2', lastname=u'u3') Session().commit() self.u2 = self.u2.user_id self.u3 = UserModel().create_or_update(username=u'u3', password=u'qweqwe', - email=u'u3@rhodecode.org', + email=u'u3@example.com', firstname=u'u3', lastname=u'u3') Session().commit() self.u3 = self.u3.user_id
--- a/rhodecode/tests/models/test_permissions.py Wed Jul 02 19:03:53 2014 -0400 +++ b/rhodecode/tests/models/test_permissions.py Wed Jul 02 19:03:55 2014 -0400 @@ -29,20 +29,20 @@ def setUp(self): self.u1 = UserModel().create_or_update( username=u'u1', password=u'qweqwe', - email=u'u1@rhodecode.org', firstname=u'u1', lastname=u'u1' + email=u'u1@example.com', firstname=u'u1', lastname=u'u1' ) self.u2 = UserModel().create_or_update( username=u'u2', password=u'qweqwe', - email=u'u2@rhodecode.org', firstname=u'u2', lastname=u'u2' + email=u'u2@example.com', firstname=u'u2', lastname=u'u2' ) self.u3 = UserModel().create_or_update( username=u'u3', password=u'qweqwe', - email=u'u3@rhodecode.org', firstname=u'u3', lastname=u'u3' + email=u'u3@example.com', firstname=u'u3', lastname=u'u3' ) self.anon = User.get_default_user() self.a1 = UserModel().create_or_update( username=u'a1', password=u'qweqwe', - email=u'a1@rhodecode.org', firstname=u'a1', lastname=u'a1', admin=True + email=u'a1@example.com', firstname=u'a1', lastname=u'a1', admin=True ) Session().commit()
--- a/rhodecode/tests/models/test_users.py Wed Jul 02 19:03:53 2014 -0400 +++ b/rhodecode/tests/models/test_users.py Wed Jul 02 19:03:55 2014 -0400 @@ -22,7 +22,7 @@ def test_create_and_remove(self): usr = UserModel().create_or_update(username=u'test_user', password=u'qweqwe', - email=u'u232@rhodecode.org', + email=u'u232@example.com', firstname=u'u1', lastname=u'u1') Session().commit() self.assertEqual(User.get_by_username(u'test_user'), usr) @@ -44,13 +44,13 @@ def test_additonal_email_as_main(self): usr = UserModel().create_or_update(username=u'test_user', password=u'qweqwe', - email=u'main_email@rhodecode.org', + email=u'main_email@example.com', firstname=u'u1', lastname=u'u1') Session().commit() def do(): m = UserEmailMap() - m.email = u'main_email@rhodecode.org' + m.email = u'main_email@example.com' m.user = usr Session().add(m) Session().commit() @@ -62,24 +62,24 @@ def test_extra_email_map(self): usr = UserModel().create_or_update(username=u'test_user', password=u'qweqwe', - email=u'main_email@rhodecode.org', + email=u'main_email@example.com', firstname=u'u1', lastname=u'u1') Session().commit() m = UserEmailMap() - m.email = u'main_email2@rhodecode.org' + m.email = u'main_email2@example.com' m.user = usr Session().add(m) Session().commit() - u = User.get_by_email(email='main_email@rhodecode.org') + u = User.get_by_email(email='main_email@example.com') self.assertEqual(usr.user_id, u.user_id) self.assertEqual(usr.username, u.username) - u = User.get_by_email(email='main_email2@rhodecode.org') + u = User.get_by_email(email='main_email2@example.com') self.assertEqual(usr.user_id, u.user_id) self.assertEqual(usr.username, u.username) - u = User.get_by_email(email='main_email3@rhodecode.org') + u = User.get_by_email(email='main_email3@example.com') self.assertEqual(None, u) UserModel().delete(usr.user_id) @@ -94,7 +94,7 @@ def setUp(self): self.u1 = UserModel().create_or_update(username=u'u1', password=u'qweqwe', - email=u'u1@rhodecode.org', + email=u'u1@example.com', firstname=u'u1', lastname=u'u1') def tearDown(self):
--- a/rhodecode/tests/scripts/create_rc.sh Wed Jul 02 19:03:53 2014 -0400 +++ b/rhodecode/tests/scripts/create_rc.sh Wed Jul 02 19:03:55 2014 -0400 @@ -6,9 +6,9 @@ echo "run those after running server" paster serve rc.ini --pid-file=rc.pid --daemon sleep 3 -rhodecode-api --apikey=$API_KEY --apihost=http://127.0.0.1:5001 create_user username:demo1 password:qweqwe email:demo1@rhodecode.org -rhodecode-api --apikey=$API_KEY --apihost=http://127.0.0.1:5001 create_user username:demo2 password:qweqwe email:demo2@rhodecode.org -rhodecode-api --apikey=$API_KEY --apihost=http://127.0.0.1:5001 create_user username:demo3 password:qweqwe email:demo3@rhodecode.org +rhodecode-api --apikey=$API_KEY --apihost=http://127.0.0.1:5001 create_user username:demo1 password:qweqwe email:demo1@example.com +rhodecode-api --apikey=$API_KEY --apihost=http://127.0.0.1:5001 create_user username:demo2 password:qweqwe email:demo2@example.com +rhodecode-api --apikey=$API_KEY --apihost=http://127.0.0.1:5001 create_user username:demo3 password:qweqwe email:demo3@example.com rhodecode-api --apikey=$API_KEY --apihost=http://127.0.0.1:5001 create_user_group group_name:demo12 rhodecode-api --apikey=$API_KEY --apihost=http://127.0.0.1:5001 add_user_to_user_group usergroupid:demo12 userid:demo1 rhodecode-api --apikey=$API_KEY --apihost=http://127.0.0.1:5001 add_user_to_user_group usergroupid:demo12 userid:demo2