Skip to content

Commit

Permalink
Fix up tests to use usermodel
Browse files Browse the repository at this point in the history
  • Loading branch information
hamishwillee committed Oct 30, 2023
1 parent 0366f96 commit 8e60a80
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions catalog/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,16 @@ def test_lists_all_authors(self):
from catalog.models import BookInstance, Book, Genre, Language
from django.contrib.auth.models import User # Required to assign User as a borrower

# Get user model from settings
from django.contrib.auth import get_user_model
UserModel = get_user_model()

class LoanedBookInstancesByUserListViewTest(TestCase):

def setUp(self):
# Create two users
test_user1 = User.objects.create_user(username='testuser1', password='1X<ISRUkw+tuK')
test_user2 = User.objects.create_user(username='testuser2', password='2HJ1vRV0Z&3iD')
test_user1 = UserModel.objects.create_user(username='testuser1', password='1X<ISRUkw+tuK')
test_user2 = UserModel.objects.create_user(username='testuser2', password='2HJ1vRV0Z&3iD')

test_user1.save()
test_user2.save()
Expand Down Expand Up @@ -194,10 +197,10 @@ class RenewBookInstancesViewTest(TestCase):

def setUp(self):
# Create a user
test_user1 = User.objects.create_user(username='testuser1', password='1X<ISRUkw+tuK')
test_user1 = UserModel.objects.create_user(username='testuser1', password='1X<ISRUkw+tuK')
test_user1.save()

test_user2 = User.objects.create_user(username='testuser2', password='2HJ1vRV0Z&3iD')
test_user2 = UserModel.objects.create_user(username='testuser2', password='2HJ1vRV0Z&3iD')
test_user2.save()
permission = Permission.objects.get(name='Set book as returned')
test_user2.user_permissions.add(permission)
Expand Down Expand Up @@ -305,8 +308,8 @@ class AuthorCreateViewTest(TestCase):

def setUp(self):
# Create a user
test_user1 = User.objects.create_user(username='testuser1', password='1X<ISRUkw+tuK')
test_user2 = User.objects.create_user(username='testuser2', password='2HJ1vRV0Z&3iD')
test_user1 = UserModel.objects.create_user(username='testuser1', password='1X<ISRUkw+tuK')
test_user2 = UserModel.objects.create_user(username='testuser2', password='2HJ1vRV0Z&3iD')

test_user1.save()
test_user2.save()
Expand Down

0 comments on commit 8e60a80

Please sign in to comment.