Change domain used for email addresses in tests

rhodecode/tests/api/api_base.py

@@ -99,7 +99,7 b' class BaseTestApi(object):'
         cls.test_user = UserModel().create_or_update(
             username='test-api',
             password='test',
-            email='[e-mail]',
+            email='[e-mail]',
             firstname='first',
             lastname='last'
         )
@@ -649,7 +649,7 b' class BaseTestApi(object):'
     def test_api_delete_user(self):
         usr = UserModel().create_or_update(username=u'test_user',
                                            password=u'qweqwe',
-                                           email=u'[e-mail]',
+                                           email=u'[e-mail]',
                                            firstname=u'u1', lastname=u'u1')
         Session().commit()
         username = usr.username
@@ -670,7 +670,7 b' class BaseTestApi(object):'
     def test_api_delete_user_when_exception_happened(self):
         usr = UserModel().create_or_update(username=u'test_user',
                                            password=u'qweqwe',
-                                           email=u'[e-mail]',
+                                           email=u'[e-mail]',
                                            firstname=u'u1', lastname=u'u1')
         Session().commit()
         username = usr.username

rhodecode/tests/fixture.py

@@ -105,7 +105,7 b' class Fixture(object):'
         defs = dict(
             username=name,
             password='qweqwe',
-            email='[e-mail]' % name,
+            email='[e-mail]' % name,
             firstname='TestUser',
             lastname='Test',
             active=True,

rhodecode/tests/functional/test_admin_notifications.py

@@ -18,7 +18,7 b' class TestNotificationsController(TestCo'
         self.log_user()
 
         u1 = UserModel().create_or_update(username='u1', password='qweqwe',
-                                          email='[e-mail]',
+                                          email='[e-mail]',
                                           firstname='u1', lastname='u1')
         u1 = u1.user_id
 
@@ -37,10 +37,10 b' class TestNotificationsController(TestCo'
         cur_user = self._get_logged_user()
 
         u1 = UserModel().create_or_update(username='u1', password='qweqwe',
-                                               email='[e-mail]',
+                                               email='[e-mail]',
                                                firstname='u1', lastname='u1')
         u2 = UserModel().create_or_update(username='u2', password='qweqwe',
-                                               email='[e-mail]',
+                                               email='[e-mail]',
                                                firstname='u2', lastname='u2')
 
         # make notifications
@@ -71,10 +71,10 b' class TestNotificationsController(TestCo'
         self.log_user()
         cur_user = self._get_logged_user()
         u1 = UserModel().create_or_update(username='u1', password='qweqwe',
-                                          email='[e-mail]',
+                                          email='[e-mail]',
                                           firstname='u1', lastname='u1')
         u2 = UserModel().create_or_update(username='u2', password='qweqwe',
-                                          email='[e-mail]',
+                                          email='[e-mail]',
                                           firstname='u2', lastname='u2')
 
         subject = u'test'

rhodecode/tests/functional/test_admin_users.py

@@ -123,7 +123,7 b' class TestAdminUsersController(TestContr'
     def test_update(self, name, attrs):
         self.log_user()
         usr = fixture.create_user(self.test_user_1, password='qweqwe',
-                                  email='[e-mail]',
+                                  email='[e-mail]',
                                   extern_type='rhodecode',
                                   extern_name=self.test_user_1,
                                   skip_if_exists=True)

rhodecode/tests/functional/test_forks.py

@@ -33,7 +33,7 b' class _BaseTest(TestController):'
         self.username = u'forkuser'
         self.password = u'qweqwe'
         self.u1 = fixture.create_user(self.username, password=self.password,
-                                      email=u'[e-mail]')
+                                      email=u'[e-mail]')
         Session().commit()
 
     def tearDown(self):

rhodecode/tests/functional/test_login.py

@@ -63,7 +63,7 b' class TestLoginController(TestController'
 
     @parameterized.expand([
           ('data:text/html,<script>window.alert("xss")</script>',),
-          ('mailto:[e-mail]',),
+          ('mailto:[e-mail]',),
           ('file:///etc/passwd',),
           ('ftp://some.ftp.server',),
           ('http://other.domain',),

rhodecode/tests/functional/test_my_account.py

@@ -108,7 +108,7 b' class TestMyAccountController(TestContro'
         ])
     def test_my_account_update(self, name, attrs):
         usr = fixture.create_user(self.test_user_1, password='qweqwe',
-                                  email='[e-mail]',
+                                  email='[e-mail]',
                                   extern_type='rhodecode',
                                   extern_name=self.test_user_1,
                                   skip_if_exists=True)

rhodecode/tests/models/common.py

@@ -54,7 +54,7 b' def _create_project_tree():'
     """
     test_u1 = UserModel().create_or_update(
         username=u'test_u1', password=u'qweqwe',
-        email=u'[e-mail]', firstname=u'test_u1', lastname=u'test_u1'
+        email=u'[e-mail]', 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)

rhodecode/tests/models/test_notifications.py

@@ -13,21 +13,21 b' class TestNotifications(BaseTestCase):'
         Session.remove()
         self.u1 = UserModel().create_or_update(username=u'u1',
                                         password=u'qweqwe',
-                                        email=u'[e-mail]',
+                                        email=u'[e-mail]',
                                         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'[e-mail]',
+                                        email=u'[e-mail]',
                                         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'[e-mail]',
+                                        email=u'[e-mail]',
                                         firstname=u'u3', lastname=u'u3')
         Session().commit()
         self.u3 = self.u3.user_id

rhodecode/tests/models/test_permissions.py

@@ -29,20 +29,20 b' class TestPermissions(BaseTestCase):'
     def setUp(self):
         self.u1 = UserModel().create_or_update(
             username=u'u1', password=u'qweqwe',
-            email=u'[e-mail]', firstname=u'u1', lastname=u'u1'
+            email=u'[e-mail]', firstname=u'u1', lastname=u'u1'
         )
         self.u2 = UserModel().create_or_update(
             username=u'u2', password=u'qweqwe',
-            email=u'[e-mail]', firstname=u'u2', lastname=u'u2'
+            email=u'[e-mail]', firstname=u'u2', lastname=u'u2'
         )
         self.u3 = UserModel().create_or_update(
             username=u'u3', password=u'qweqwe',
-            email=u'[e-mail]', firstname=u'u3', lastname=u'u3'
+            email=u'[e-mail]', 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'[e-mail]', firstname=u'a1', lastname=u'a1', admin=True
+            email=u'[e-mail]', firstname=u'a1', lastname=u'a1', admin=True
         )
         Session().commit()
 

rhodecode/tests/models/test_users.py

@@ -22,7 +22,7 b' class TestUser(BaseTestCase):'
     def test_create_and_remove(self):
         usr = UserModel().create_or_update(username=u'test_user',
                                            password=u'qweqwe',
-                                           email=u'[e-mail]',
+                                           email=u'[e-mail]',
                                            firstname=u'u1', lastname=u'u1')
         Session().commit()
         self.assertEqual(User.get_by_username(u'test_user'), usr)
@@ -44,13 +44,13 b' class TestUser(BaseTestCase):'
     def test_additonal_email_as_main(self):
         usr = UserModel().create_or_update(username=u'test_user',
                                            password=u'qweqwe',
-                                     email=u'[e-mail]',
+                                     email=u'[e-mail]',
                                      firstname=u'u1', lastname=u'u1')
         Session().commit()
 
         def do():
             m = UserEmailMap()
-            m.email = u'[e-mail]'
+            m.email = u'[e-mail]'
             m.user = usr
             Session().add(m)
             Session().commit()
@@ -62,24 +62,24 b' class TestUser(BaseTestCase):'
     def test_extra_email_map(self):
         usr = UserModel().create_or_update(username=u'test_user',
                                            password=u'qweqwe',
-                                     email=u'[e-mail]',
+                                     email=u'[e-mail]',
                                      firstname=u'u1', lastname=u'u1')
         Session().commit()
 
         m = UserEmailMap()
-        m.email = u'[e-mail]'
+        m.email = u'[e-mail]'
         m.user = usr
         Session().add(m)
         Session().commit()
 
-        u = User.get_by_email(email='[e-mail]')
+        u = User.get_by_email(email='[e-mail]')
         self.assertEqual(usr.user_id, u.user_id)
         self.assertEqual(usr.username, u.username)
 
-        u = User.get_by_email(email='[e-mail]')
+        u = User.get_by_email(email='[e-mail]')
         self.assertEqual(usr.user_id, u.user_id)
         self.assertEqual(usr.username, u.username)
-        u = User.get_by_email(email='[e-mail]')
+        u = User.get_by_email(email='[e-mail]')
         self.assertEqual(None, u)
 
         UserModel().delete(usr.user_id)
@@ -94,7 +94,7 b' class TestUsers(BaseTestCase):'
     def setUp(self):
         self.u1 = UserModel().create_or_update(username=u'u1',
                                         password=u'qweqwe',
-                                        email=u'[e-mail]',
+                                        email=u'[e-mail]',
                                         firstname=u'u1', lastname=u'u1')
 
     def tearDown(self):

rhodecode/tests/scripts/create_rc.sh

@@ -6,9 +6,9 b' API_KEY=`psql -R " " -A -U postgres -h l'
 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:[e-mail]
-rhodecode-api --apikey=$API_KEY --apihost=http://127.0.0.1:5001 create_user username:demo2 password:qweqwe email:[e-mail]
-rhodecode-api --apikey=$API_KEY --apihost=http://127.0.0.1:5001 create_user username:demo3 password:qweqwe email:[e-mail]
+rhodecode-api --apikey=$API_KEY --apihost=http://127.0.0.1:5001 create_user username:demo1 password:qweqwe email:[e-mail]
+rhodecode-api --apikey=$API_KEY --apihost=http://127.0.0.1:5001 create_user username:demo2 password:qweqwe email:[e-mail]
+rhodecode-api --apikey=$API_KEY --apihost=http://127.0.0.1:5001 create_user username:demo3 password:qweqwe email:[e-mail]
 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