Change tests to use email address rather than username where possible.

mkt/api/tests/test_oauth.py

@@ -217,14 +217,14 @@ def test_bad_access_token(self):
 
     def test_get_authorize_page(self):
         t = Token.generate_new(REQUEST_TOKEN, self.access)
-        self.client.login(username='regular@mozilla.com', password='password')
+        self.login('regular@mozilla.com')
         res = self.client.get('/oauth/authorize/', data={'oauth_token': t.key})
         eq_(res.status_code, 200)
         page = pq(res.content)
         eq_(page('input[name=oauth_token]').attr('value'), t.key)
 
     def test_get_authorize_page_bad_token(self):
-        self.client.login(username='regular@mozilla.com', password='password')
+        self.login('regular@mozilla.com')
         res = self.client.get('/oauth/authorize/',
                               data={'oauth_token': 'bad_token_value'})
         eq_(res.status_code, 401)
@@ -234,7 +234,7 @@ def test_post_authorize_page(self):
         full_redirect = (
             self.redirect_uri + '?oauth_token=%s&oauth_verifier=%s'
             % (t.key, t.verifier))
-        self.client.login(username='regular@mozilla.com', password='password')
+        self.login('regular@mozilla.com')
         url = reverse('mkt.developers.oauth_authorize')
         res = self.client.post(url, data={'oauth_token': t.key, 'grant': ''})
         eq_(res.status_code, 302)
@@ -243,14 +243,14 @@ def test_post_authorize_page(self):
 
     def test_deny_authorize_page(self):
         t = Token.generate_new(REQUEST_TOKEN, self.access)
-        self.client.login(username='regular@mozilla.com', password='password')
+        self.login('regular@mozilla.com')
         url = reverse('mkt.developers.oauth_authorize')
         res = self.client.post(url, data={'oauth_token': t.key, 'deny': ''})
         eq_(res.status_code, 200)
         eq_(Token.objects.filter(pk=t.pk).count(), 0)
 
     def test_fail_authorize_page(self):
-        self.client.login(username='regular@mozilla.com', password='password')
+        self.login('regular@mozilla.com')
         url = reverse('mkt.developers.oauth_authorize')
         res = self.client.post(url, data={'oauth_token': "fake", 'grant': ''})
         eq_(res.status_code, 401)

mkt/comm/tests/test_models.py

@@ -29,11 +29,11 @@ class PermissionTestMixin(object):
     def setUp(self):
         self.addon = Webapp.objects.get()
         self.version = self.addon.current_version
-        self.user = UserProfile.objects.get(username='regularuser')
+        self.user = UserProfile.objects.get(email='regular@mozilla.com')
 
         self.thread = CommunicationThread.objects.create(
             _addon=self.addon, _version=self.version)
-        self.author = UserProfile.objects.create(email='lol', username='lol')
+        self.author = user_factory(email='lol')
         self.note = CommunicationNote.objects.create(
             thread=self.thread, author=self.author, note_type=0, body='xyz')
         self.obj = None
@@ -194,7 +194,7 @@ class TestCommAttachment(TestCase, CommTestMixin):
     XSS_STRING = 'MMM <script>alert(bacon);</script>'
 
     def setUp(self):
-        self.user = user_factory(username='porkbelly')
+        self.user = user_factory(email='porkbelly')
         mkt.set_user(self.user)
         self.profile = self.user
         self.addon = Webapp.objects.get()

mkt/comm/tests/test_serializers.py

@@ -10,13 +10,13 @@ class TestNoteSerializer(TestCase):
 
     def test_author(self):
         app = app_factory()
-        user = user_factory()
+        user = user_factory(display_name='Bob')
         thread, note = create_comm_note(app, app.current_version, user, 'hue')
 
         data = serializers.NoteSerializer(note, context={
             'request': req_factory_factory()
         }).data
-        eq_(data['author_meta']['name'], user.username)
+        eq_(data['author_meta']['name'], 'Bob')
         ok_(data['author_meta']['gravatar_hash'])
 
     def test_no_author(self):

mkt/comm/tests/test_utils_.py

@@ -14,7 +14,7 @@
 class TestCreateCommNote(TestCase, AttachmentManagementMixin):
 
     def setUp(self):
-        self.contact = user_factory(username='contact')
+        self.contact = user_factory(email='contact')
         self.user = user_factory()
         self.grant_permission(self.user, '*:*')
         self.app = app_factory(mozilla_contact=self.contact.email)

mkt/comm/tests/test_views.py

@@ -138,7 +138,7 @@ def test_response_deleted_version_app(self):
         eq_(res.json['version_is_obsolete'], True)
 
     def test_recent_notes_perm(self):
-        staff = UserProfile.objects.get(username='support_staff')
+        staff = UserProfile.objects.get(email='support-staff@mozilla.com')
         self.addon.addonuser_set.create(user=self.profile)
         thread = self._thread_factory(read_permission_developer=True)
         self._note_factory(
@@ -364,7 +364,7 @@ def test_response(self):
         ok_(not res.json['attachments'][0]['is_image'])
 
     def test_read_perms(self):
-        staff = UserProfile.objects.get(username='support_staff')
+        staff = UserProfile.objects.get(email='support-staff@mozilla.com')
         self._note_factory(
             self.thread, perms=['developer'], author=staff, body='oncetoldme')
         no_dev_note = self._note_factory(

mkt/detail/tests/test_views.py

@@ -60,13 +60,12 @@ def _mocked_json(self):
 
     def login_as_reviewer(self):
         self.client.logout()
-        assert self.client.login(username='editor@mozilla.com',
-                                 password='password')
+        self.login('editor@mozilla.com')
 
     def login_as_author(self):
         self.client.logout()
         user = self.app.authors.all()[0]
-        assert self.client.login(username=user.email, password='password')
+        self.login(user.email)
 
     def test_non_packaged(self):
         self.app.update(is_packaged=False)

mkt/developers/models.py

@@ -317,7 +317,7 @@ def review_queue(self, webapp=False):
     def total_reviews(self, webapp=False):
         qs = self._by_type(webapp)
         """Return the top users, and their # of reviews."""
-        return (qs.values('user', 'user__display_name', 'user__username')
+        return (qs.values('user', 'user__display_name', 'user__email')
                   .filter(action__in=mkt.LOG_REVIEW_QUEUE)
                   .exclude(user__id=settings.TASK_USER_ID)
                   .annotate(approval_count=models.Count('id'))
@@ -328,7 +328,7 @@ def monthly_reviews(self, webapp=False):
         qs = self._by_type(webapp)
         now = datetime.now()
         created_date = datetime(now.year, now.month, 1)
-        return (qs.values('user', 'user__display_name', 'user__username')
+        return (qs.values('user', 'user__display_name', 'user__email')
                   .filter(created__gte=created_date,
                           action__in=mkt.LOG_REVIEW_QUEUE)
                   .exclude(user__id=settings.TASK_USER_ID)

mkt/developers/tests/test_forms.py

@@ -79,7 +79,7 @@ class TestCategoryForm(mkt.site.tests.WebappTestCase):
 
     def setUp(self):
         super(TestCategoryForm, self).setUp()
-        self.user = UserProfile.objects.get(username='regularuser')
+        self.user = UserProfile.objects.get(email='regular@mozilla.com')
         self.app = Webapp.objects.get(pk=337141)
         self.request = RequestFactory()
         self.request.user = self.user
@@ -705,7 +705,7 @@ class TestAdminSettingsForm(TestAdmin):
     def setUp(self):
         super(TestAdminSettingsForm, self).setUp()
         self.data = {'position': 1}
-        self.user = UserProfile.objects.get(username='admin')
+        self.user = UserProfile.objects.get(email='admin@mozilla.com')
         self.request = RequestFactory()
         self.request.user = self.user
         self.request.groups = ()

mkt/developers/tests/test_models.py

@@ -15,8 +15,9 @@
                                    PaymentAccount, PreloadTestPlan,
                                    SolitudeSeller)
 from mkt.developers.providers import get_provider
-from mkt.site.utils import app_factory
 from mkt.site.fixtures import fixture
+from mkt.site.tests import user_factory
+from mkt.site.utils import app_factory
 from mkt.users.models import UserProfile
 from mkt.webapps.models import Webapp
 from .test_providers import Patcher
@@ -229,7 +230,7 @@ class TestActivityLogAttachment(mkt.site.tests.TestCase):
     XSS_STRING = 'MMM <script>alert(bacon);</script>'
 
     def setUp(self):
-        self.user = self._user()
+        self.user = user_factory(email='porkbelly')
         addon = Webapp.objects.get(pk=337141)
         version = addon.latest_version
         al = mkt.log(mkt.LOG.COMMENT_VERSION, addon, version, user=self.user)
@@ -238,12 +239,6 @@ def setUp(self):
     def tearDown(self):
         mkt.set_user(None)
 
-    def _user(self):
-        """Create and return a user"""
-        u = UserProfile.objects.create(username='porkbelly')
-        mkt.set_user(u)
-        return u
-
     def _attachments(self, activity_log):
         """
         Create and return a tuple of ActivityLogAttachment instances.

mkt/developers/tests/test_tasks.py

@@ -481,8 +481,7 @@ def webapp_from_path(self, path):
         self.upload = self.get_upload(abspath=path,
                                       user=UserProfile.objects.get(pk=999))
         self.url = reverse('submit.app')
-        assert self.client.login(username='regular@mozilla.com',
-                                 password='password')
+        self.login('regular@mozilla.com')
         return self.post_addon()
 
     def test_no_version(self):