.local email

tracim/tracim/fixtures/ldap.py

@@ -46,11 +46,11 @@ ldap_test_server_fixtures = {
         },
         {
             'objectclass': ['account', 'top'],
-            'dn': 'cn=lawrence-not-real-email@fsf.org,ou=people,dc=directory,dc=fsf,dc=org',
+            'dn': 'cn=lawrence-not-real-email@fsf.local,ou=people,dc=directory,dc=fsf,dc=org',
             'attributes': {
-                'uid': 'lawrence-not-real-email@fsf.org',
+                'uid': 'lawrence-not-real-email@fsf.local',
                 'userPassword': 'foobarbaz',
-                'mail': 'lawrence-not-real-email@fsf.org',
+                'mail': 'lawrence-not-real-email@fsf.local',
                 'pubname': 'Lawrence Lessig',
             }
         },

tracim/tracim/fixtures/users_and_groups.py

@@ -43,7 +43,7 @@ class Test(Fixture):
 
         lawrence = model.User()
         lawrence.display_name = 'Lawrence L.'
-        lawrence.email = 'lawrence-not-real-email@fsf.org'
+        lawrence.email = 'lawrence-not-real-email@fsf.local'
         lawrence.password = 'foobarbaz'
         self._session.add(lawrence)
         g2.users.append(lawrence)

tracim/tracim/tests/functional/test_ldap_authentication.py

@@ -44,13 +44,13 @@ class TestAuthentication(LDAPTest, TracimTestController):
 
     def test_ldap_attributes_sync(self):
         # User is already know in database
-        eq_(1, DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.org').count())
+        eq_(1, DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.local').count())
 
         # His display name is Lawrence L.
-        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.org').one()
+        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.local').one()
         eq_('Lawrence L.', lawrence.display_name)
 
         # After connexion with LDAP, his display_name is updated (see ldap fixtures)
-        self._connect_user('lawrence-not-real-email@fsf.org', 'foobarbaz')
-        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.org').one()
+        self._connect_user('lawrence-not-real-email@fsf.local', 'foobarbaz')
+        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.local').one()
         eq_('Lawrence Lessig', lawrence.display_name)

tracim/tracim/tests/functional/test_ldap_restrictions.py

@@ -21,8 +21,8 @@ class TestAuthentication(LDAPTest, TracimTestController):
         Password change is disabled
         :return:
         """
-        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.org').one()
-        self._connect_user('lawrence-not-real-email@fsf.org', 'foobarbaz')
+        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.local').one()
+        self._connect_user('lawrence-not-real-email@fsf.local', 'foobarbaz')
         home = self.app.get('/home/',)
 
         # HTML button is not here
@@ -45,8 +45,8 @@ class TestAuthentication(LDAPTest, TracimTestController):
         Some fields (email) are not editable on user interface: they are managed by LDAP
         :return:
         """
-        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.org').one()
-        self._connect_user('lawrence-not-real-email@fsf.org', 'foobarbaz')
+        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.local').one()
+        self._connect_user('lawrence-not-real-email@fsf.local', 'foobarbaz')
 
         edit = self.app.get('/user/5/edit')
 
@@ -60,7 +60,7 @@ class TestAuthentication(LDAPTest, TracimTestController):
         ok_('readonly' not in name_input.attrs)
 
         # If we force edit of user, "email" field will be not updated
-        eq_(lawrence.email, 'lawrence-not-real-email@fsf.org')
+        eq_(lawrence.email, 'lawrence-not-real-email@fsf.local')
         eq_(lawrence.display_name, 'Lawrence L.')
 
         try_post_user = self.app.post(
@@ -73,6 +73,6 @@ class TestAuthentication(LDAPTest, TracimTestController):
 
         eq_(try_post_user.status_code, 302, "Code should be 302, but is %d" % try_post_user.status_code)
 
-        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.org').one()
-        eq_(lawrence.email, 'lawrence-not-real-email@fsf.org', "email should be unmodified")
+        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.local').one()
+        eq_(lawrence.email, 'lawrence-not-real-email@fsf.local', "email should be unmodified")
         eq_(lawrence.display_name, 'Lawrence Lessig YEAH', "Name should be updated")

tracim/tracim/tests/library/test_ldap_without_ldap_groups.py

@@ -68,12 +68,12 @@ class TestContentApi(LDAPTest, TestStandard):
         LDAP don't manage groups here: We must retrieve internal groups of tested user
         :return:
         """
-        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.org').one()
+        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.local').one()
         managers = DBSession.query(Group).filter(Group.group_name == 'managers').one()
         lawrence_identity = {'user': lawrence}
 
         # Lawrence is in fixtures: he is in managers group
-        self._check_db_user('lawrence-not-real-email@fsf.org', 1)
+        self._check_db_user('lawrence-not-real-email@fsf.local', 1)
         assert lawrence in managers.users
         assert False is ini_conf_to_bool(config.get('ldap_group_enabled', False))
         assert ['managers'] == config.get('sa_auth').authmetadata.get_groups(
@@ -95,12 +95,12 @@ class TestContentApi(LDAPTest, TestStandard):
         LDAP don't manage groups here: We must retrieve internal groups permission of tested user
         :return:
         """
-        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.org').one()
+        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.local').one()
         managers = DBSession.query(Group).filter(Group.group_name == 'managers').one()
         lawrence_identity = {'user': lawrence}
 
         # Lawrence is in fixtures: he is in managers group
-        self._check_db_user('lawrence-not-real-email@fsf.org', 1)
+        self._check_db_user('lawrence-not-real-email@fsf.local', 1)
         assert lawrence in managers.users
         assert False is ini_conf_to_bool(config.get('ldap_group_enabled', False))