Fix tests

tests/seahub/institutions/test_views.py

@@ -1,7 +1,6 @@
 from django.core import mail
 from django.conf import settings
 from django.core.urlresolvers import reverse
-from django.http.cookie import parse_cookie
 from django.test import override_settings
 
 from seahub.base.accounts import User

tests/seahub/views/init/test_i18n.py

@@ -1,5 +1,4 @@
 from django.core.urlresolvers import reverse
-from django.http.cookie import parse_cookie
 
 from seahub.test_utils import BaseTestCase
 from seahub.profile.models import Profile
@@ -9,12 +8,12 @@ class I18nTest(BaseTestCase):
     def test_can_set_to_zh(self):
         resp = self.client.get(reverse('i18n') + '?lang=zh-cn')
         self.assertEqual(302, resp.status_code)
-        assert parse_cookie(resp.cookies)['django_language'] == 'zh-cn'
+        assert resp.cookies['django_language'].value == 'zh-cn'
 
     def test_wrong_lang_code(self):
         resp = self.client.get(reverse('i18n') + '?lang=zh_CN')
         self.assertEqual(302, resp.status_code)
-        assert parse_cookie(resp.cookies)['django_language'] == 'en'
+        assert resp.cookies['django_language'].value == 'en'
 
     def test_anonymous_user_profile(self):
         # Should not add profile record when user is anonymous.

tests/seahub/views/sysadmin/test_sys_inst_toggle_admin.py

@@ -1,5 +1,4 @@
 from django.core.urlresolvers import reverse
-from django.http.cookie import parse_cookie
 
 from seahub.institutions.models import Institution, InstitutionAdmin
 from seahub.profile.models import Profile
@@ -24,12 +23,12 @@ class SysInstInfoUserTest(BaseTestCase):
         assert len(InstitutionAdmin.objects.filter(institution=self.inst)) == 0
         resp = self.client.post(self.url)
         self.assertEqual(302, resp.status_code)
-        assert 'Success' in parse_cookie(resp.cookies)['messages']
+        assert 'Success' in resp.cookies['messages'].value
 
         assert len(InstitutionAdmin.objects.filter(institution=self.inst)) == 1
 
         resp = self.client.post(self.url)
         self.assertEqual(302, resp.status_code)
-        assert 'Success' in parse_cookie(resp.cookies)['messages']
+        assert 'Success' in resp.cookies['messages'].value
 
         assert len(InstitutionAdmin.objects.filter(institution=self.inst)) == 0

tests/seahub/views/sysadmin/test_sysadmin.py

@@ -1,7 +1,6 @@
 import os
 from mock import patch
 from django.core.urlresolvers import reverse
-from django.http.cookie import parse_cookie
 from post_office.models import Email
 
 from seahub.base.accounts import User
@@ -98,7 +97,7 @@ class UserRemoveTest(BaseTestCase):
         )
 
         self.assertEqual(302, resp.status_code)
-        assert 'Successfully deleted %s' % username in parse_cookie(resp.cookies)['messages']
+        assert 'Successfully deleted %s' % username in resp.cookies['messages'].value
         assert len(ccnet_threaded_rpc.search_emailusers('DB', username, -1, -1))  == 0
 
 
@@ -190,7 +189,7 @@ class BatchAddUserTest(BaseTestCase):
             })
 
         self.assertEqual(302, resp.status_code)
-        assert 'Import succeeded' in parse_cookie(resp.cookies)['messages']
+        assert 'Import succeeded' in resp.cookies['messages'].value
         for e in self.new_users:
             assert User.objects.get(e) is not None
 
@@ -214,7 +213,7 @@ class BatchAddUserTest(BaseTestCase):
             })
 
         self.assertEqual(302, resp.status_code)
-        assert 'Import succeeded' in parse_cookie(resp.cookies)['messages']
+        assert 'Import succeeded' in resp.cookies['messages'].value
         for e in self.new_users:
             assert User.objects.get(e) is not None
             assert UserOptions.objects.passwd_change_required(e)
@@ -239,7 +238,7 @@ class BatchAddUserTest(BaseTestCase):
             })
 
         self.assertEqual(302, resp.status_code)
-        assert 'Import succeeded' in parse_cookie(resp.cookies)['messages']
+        assert 'Import succeeded' in resp.cookies['messages'].value
         for e in self.new_users:
             assert User.objects.get(e) is not None
             assert not UserOptions.objects.passwd_change_required(e)
@@ -262,7 +261,7 @@ class BatchAddUserTest(BaseTestCase):
             })
 
         self.assertEqual(302, resp.status_code)
-        assert 'users exceeds the limit' in parse_cookie(resp.cookies)['messages']
+        assert 'users exceeds the limit' in resp.cookies['messages'].value
 
     def test_can_send_email(self):
         self.assertEqual(0, len(Email.objects.all()))

tests/seahub/views/sysadmin/test_user_reset.py

@@ -1,7 +1,6 @@
 from mock import patch
 from django.core import mail
 from django.core.urlresolvers import reverse
-from django.http.cookie import parse_cookie
 from constance import config
 
 from seahub.base.accounts import User
@@ -30,7 +29,7 @@ class UserResetTest(BaseTestCase):
             reverse('user_reset', args=[self.user.email])
         )
         self.assertEqual(302, resp.status_code)
-        assert 'email has been sent to contact@mail.com' in parse_cookie(resp.cookies)['messages']
+        assert 'email has been sent to contact@mail.com' in resp.cookies['messages'].value
 
         self.assertEqual(len(mail.outbox), 1)
         assert mail.outbox[0].to[0] != self.user.username