Use apiuser_... fixture instead of APIUser

Between writing test_api.py and test_model.py tests I created a generic
factory fixture for creating APIUser model test classes, rather than
instantiating APIUser directly. I neglected to switch to using the
fixture in the test_api tests. This takes care of that.

Author: jthomale

django/sierra/api/tests/test_api.py

@@ -7,7 +7,6 @@
 
 import pytest
 from django.contrib.auth.models import User
-from api.models import APIUser
 
 from utils.test_helpers import solr_test_profiles as tp
 
@@ -24,6 +23,7 @@
 #     assemble_test_records
 #     do_filter_search
 #     get_found_ids
+#     apiuser_with_custom_defaults
 
 
 # API_ROOT: Base URL for the API we're testing.
@@ -1950,16 +1950,18 @@ def _assemble_api_test_records(profile, id_field, test_data):
 
 @pytest.mark.django_db
 def test_apiusers_authenticated_requests(api_client,
+                                         apiuser_with_custom_defaults,
                                          simple_sig_auth_credentials,
                                          assert_obj_fields_match_serializer):
     """
     The apiusers resource requires authentication to access; users that
     can authenticate can view the apiusers list and details of a single
     apiuser. Authentication must be renewed after each request.
     """
-    api_user = APIUser.objects.create_user('test', 'secret', password='pw',
-                                           email='test@test.com',
-                                           first_name='F', last_name='Last')
+    test_cls = apiuser_with_custom_defaults()
+    api_user = test_cls.objects.create_user('test', 'secret', password='pw',
+                                            email='test@test.com',
+                                            first_name='F', last_name='Last')
     api_client.credentials(**simple_sig_auth_credentials(api_user))
     list_resp = api_client.get('{}apiusers/'.format(API_ROOT))
     assert list_resp.status_code == 200
@@ -1972,14 +1974,16 @@ def test_apiusers_authenticated_requests(api_client,
 
 @pytest.mark.django_db
 def test_apiusers_not_django_users(model_instance, api_client,
+                                   apiuser_with_custom_defaults,
                                    simple_sig_auth_credentials):
     """
     Django Users that don't have associated APIUsers records should
     not appear in the list of apiusers.
     """
-    api_user = APIUser.objects.create_user('test', 'secret', password='pw',
-                                           email='test@test.com',
-                                           first_name='F', last_name='Last')
+    test_cls = apiuser_with_custom_defaults()
+    api_user = test_cls.objects.create_user('test', 'secret', password='pw',
+                                            email='test@test.com',
+                                            first_name='F', last_name='Last')
     user = model_instance(User, 'bob', 'bob@bob.com', 'bobpassword')
     api_client.credentials(**simple_sig_auth_credentials(api_user))
     response = api_client.get('{}apiusers/'.format(API_ROOT))
@@ -1989,14 +1993,16 @@ def test_apiusers_not_django_users(model_instance, api_client,
 
 
 @pytest.mark.django_db
-def test_apiusers_unauthenticated_requests_fail(api_client):
+def test_apiusers_unauthenticated_requests_fail(api_client,
+                                                apiuser_with_custom_defaults):
     """
     Requesting an apiuser list or detail view without providing any
     authentication credentials should result in a 403 error.
     """
-    api_user = APIUser.objects.create_user('test', 'secret', password='pw',
-                                           email='test@test.com',
-                                           first_name='F', last_name='Last')
+    test_cls = apiuser_with_custom_defaults()
+    api_user = test_cls.objects.create_user('test', 'secret', password='pw',
+                                            email='test@test.com',
+                                            first_name='F', last_name='Last')
     list_resp = api_client.get('{}apiusers/'.format(API_ROOT))
     detail_resp = api_client.get('{}apiusers/test'.format(API_ROOT))
     assert list_resp.status_code == 403
@@ -2005,17 +2011,19 @@ def test_apiusers_unauthenticated_requests_fail(api_client):
 
 @pytest.mark.django_db
 def test_apiusers_wrong_username_requests_fail(api_client,
+                                               apiuser_with_custom_defaults,
                                                simple_sig_auth_credentials):
     """
     Providing an incorrect username/password pair in authentication
     headers results in a 403 error.
     """
-    api_user1 = APIUser.objects.create_user('test', 'secret', password='pw',
-                                            email='test@test.com',
-                                            first_name='F', last_name='Last')
-    api_user2 = APIUser.objects.create_user('test2', 'secret', password='pw2',
-                                            email='test2@test.com',
-                                            first_name='G', last_name='Last')
+    test_cls = apiuser_with_custom_defaults()
+    api_user1 = test_cls.objects.create_user('test', 'secret', password='pw',
+                                             email='test@test.com',
+                                             first_name='F', last_name='Last')
+    api_user2 = test_cls.objects.create_user('test2', 'secret', password='pw2',
+                                             email='test2@test.com',
+                                             first_name='G', last_name='Last')
     credentials = simple_sig_auth_credentials(api_user1)
     credentials['HTTP_X_USERNAME'] = 'test2'
     api_client.credentials(**credentials)
@@ -2025,15 +2033,17 @@ def test_apiusers_wrong_username_requests_fail(api_client,
 
 @pytest.mark.django_db
 def test_apiusers_repeated_requests_fail(api_client,
+                                         apiuser_with_custom_defaults,
                                          simple_sig_auth_credentials):
     """
     Attempting to beat apiusers authentication by submitting multiple
     requests without renewing credentials should result in a 403 error
     on the second request.
     """
-    api_user = APIUser.objects.create_user('test', 'secret', password='pw',
-                                           email='test@test.com',
-                                           first_name='F', last_name='Last')
+    test_cls = apiuser_with_custom_defaults()
+    api_user = test_cls.objects.create_user('test', 'secret', password='pw',
+                                            email='test@test.com',
+                                            first_name='F', last_name='Last')
     api_client.credentials(**simple_sig_auth_credentials(api_user))
     resp_one = api_client.get('{}apiusers/'.format(API_ROOT))
     resp_two = api_client.get('{}apiusers/'.format(API_ROOT))