|
@@ -14,11 +14,12 @@ class DatabaseBackedUserService(TestCase):
|
|
|
|
|
|
def test_create_new_user(self):
|
|
|
old_user_count = User.objects.all().count()
|
|
|
- rpc_user = user_service.get_or_create_user_by_email(email="test@email.com")
|
|
|
+ rpc_user, created = user_service.get_or_create_user_by_email(email="test@email.com")
|
|
|
user = User.objects.get(id=rpc_user.id)
|
|
|
new_user_count = User.objects.all().count()
|
|
|
assert new_user_count == old_user_count + 1
|
|
|
assert user.flags.newsletter_consent_prompt
|
|
|
+ assert created
|
|
|
|
|
|
def test_get_no_existing(self):
|
|
|
rpc_user = user_service.get_user_by_email(email="test@email.com")
|
|
@@ -27,23 +28,26 @@ class DatabaseBackedUserService(TestCase):
|
|
|
def test_get_or_create_user(self):
|
|
|
user1 = self.create_user(email="test@email.com", username="1")
|
|
|
user2 = self.create_user(email="test@email.com", username="2")
|
|
|
- user = user_service.get_or_create_user_by_email(email="test@email.com")
|
|
|
+ user, created = user_service.get_or_create_user_by_email(email="test@email.com")
|
|
|
assert user1.id == user.id
|
|
|
assert user2.id != user.id
|
|
|
+ assert created is False
|
|
|
|
|
|
def test_get_active_user(self):
|
|
|
inactive_user = self.create_user(
|
|
|
email="test@email.com", username="inactive", is_active=False
|
|
|
)
|
|
|
active_user = self.create_user(email="test@email.com", username="active")
|
|
|
- user = user_service.get_or_create_user_by_email(email="test@email.com")
|
|
|
+ user, created = user_service.get_or_create_user_by_email(email="test@email.com")
|
|
|
assert active_user.id == user.id
|
|
|
assert inactive_user.id != user.id
|
|
|
+ assert created is False
|
|
|
|
|
|
def test_get_user_ci(self):
|
|
|
user = self.create_user(email="tESt@email.com")
|
|
|
- fetched_user = user_service.get_or_create_user_by_email(email="TesT@email.com")
|
|
|
+ fetched_user, created = user_service.get_or_create_user_by_email(email="TesT@email.com")
|
|
|
assert user.id == fetched_user.id
|
|
|
+ assert created is False
|
|
|
|
|
|
def test_get_user_with_ident(self):
|
|
|
user1 = self.create_user(email="test@email.com", username="1")
|
|
@@ -55,8 +59,9 @@ class DatabaseBackedUserService(TestCase):
|
|
|
organization_id=org.id, provider="fly", config=config_data
|
|
|
)
|
|
|
AuthIdentity.objects.create(auth_provider=provider, user=user2, ident=partner_user_id)
|
|
|
- fetched_user = user_service.get_or_create_user_by_email(
|
|
|
+ fetched_user, created = user_service.get_or_create_user_by_email(
|
|
|
email="TesT@email.com", ident=partner_user_id
|
|
|
)
|
|
|
assert user2.id == fetched_user.id
|
|
|
assert user1.id != fetched_user.id
|
|
|
+ assert created is False
|