Skip to content

Commit

Permalink
⬆️ django 4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@nikolas
nikolas committed May 15, 2024
1 parent d9014aa commit e6ab2a3
Show file tree
Hide file tree
Showing 60 changed files with 1,296 additions and 1,288 deletions.
2 changes: 1 addition & 1 deletion lti_auth/tests/factories.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def generate_lti_request(course_context=None, provider=None, use=None):

request = RequestFactory().post('/lti/', params)

middleware = SessionMiddleware()
middleware = SessionMiddleware(request)
middleware.process_request(request)
request.session.save()

Expand Down
24 changes: 12 additions & 12 deletions lti_auth/tests/test_auth.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,59 +15,59 @@ def setUp(self):
def test_create_user(self):
user = self.backend.create_user(self.lti, '12345')
self.assertFalse(user.has_usable_password())
self.assertEquals(user.email, '[email protected]')
self.assertEquals(user.get_full_name(), 'Foo Baz')
self.assertEqual(user.email, '[email protected]')
self.assertEqual(user.get_full_name(), 'Foo Baz')

def test_create_user_no_full_name(self):
self.lti.lti_params.pop('lis_person_name_full')
user = self.backend.create_user(self.lti, '12345')
self.assertEquals(user.get_full_name(), 'student')
self.assertEqual(user.get_full_name(), 'student')

def test_create_user_empty_full_name(self):
self.lti.lti_params['lis_person_name_full'] = ''
user = self.backend.create_user(self.lti, '12345')
self.assertEquals(user.get_full_name(), 'student')
self.assertEqual(user.get_full_name(), 'student')

def test_create_user_long_name(self):
self.lti.lti_params['lis_person_name_full'] = (
'Pneumonoultramicroscopicsilicovolcanoconiosis '
'Supercalifragilisticexpialidocious')
user = self.backend.create_user(self.lti, '12345')
self.assertEquals(
self.assertEqual(
user.get_full_name(),
'Pneumonoultramicroscopicsilico Supercalifragilisticexpialidoc')

def test_find_or_create_user1(self):
# via email
user = UserFactory(email='[email protected]')
self.assertEquals(self.backend.find_or_create_user(self.lti), user)
self.assertEqual(self.backend.find_or_create_user(self.lti), user)

def test_find_or_create_user2(self):
# via lms username
username = 'uni123'
self.lti.lti_params['custom_canvas_user_login_id'] = username
user = UserFactory(username=username)
self.assertEquals(self.backend.find_or_create_user(self.lti), user)
self.assertEqual(self.backend.find_or_create_user(self.lti), user)

def test_find_or_create_user3(self):
# via hashed username
self.lti.lti_params['oauth_consumer_key'] = '1234567890'
username = self.backend.get_hashed_username(self.lti)
user = UserFactory(username=username)
self.assertEquals(self.backend.find_or_create_user(self.lti), user)
self.assertEqual(self.backend.find_or_create_user(self.lti), user)

def test_find_or_create_user4(self):
# new user
self.lti.lti_params['oauth_consumer_key'] = '1234567890'
user = self.backend.find_or_create_user(self.lti)
self.assertFalse(user.has_usable_password())
self.assertEquals(user.email, '[email protected]')
self.assertEquals(user.get_full_name(), 'Foo Baz')
self.assertEqual(user.email, '[email protected]')
self.assertEqual(user.get_full_name(), 'Foo Baz')

username = self.backend.get_hashed_username(self.lti)
self.assertEquals(user.username, username)
self.assertEqual(user.username, username)

def test_get_user(self):
user = UserFactory()
self.assertIsNone(self.backend.get_user(1234))
self.assertEquals(self.backend.get_user(user.id), user)
self.assertEqual(self.backend.get_user(user.id), user)
20 changes: 10 additions & 10 deletions lti_auth/tests/test_lti.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,39 +11,39 @@ class LTITest(TestCase):

def test_init(self):
lti = LTI('initial', 'any')
self.assertEquals(lti.request_type, 'initial')
self.assertEquals(lti.role_type, 'any')
self.assertEqual(lti.request_type, 'initial')
self.assertEqual(lti.role_type, 'any')

def test_consumer_user_id(self):
lti = LTI('initial', 'any')
lti.lti_params = BASE_LTI_PARAMS.copy()
lti.lti_params['oauth_consumer_key'] = '1234567890'

self.assertEquals(lti.consumer_user_id(), '1234567890-student')
self.assertEqual(lti.consumer_user_id(), '1234567890-student')

def test_user_email(self):
lti = LTI('initial', 'any')
self.assertIsNone(lti.user_email())

lti.lti_params = BASE_LTI_PARAMS
self.assertEquals(lti.user_email(), '[email protected]')
self.assertEqual(lti.user_email(), '[email protected]')

def test_user_fullname(self):
lti = LTI('initial', 'any')
self.assertEquals(lti.user_fullname(), '')
self.assertEqual(lti.user_fullname(), '')

lti.lti_params = {'user_id': 'student_one'}
self.assertEquals(lti.user_fullname(), 'student_one')
self.assertEqual(lti.user_fullname(), 'student_one')

lti.lti_params = BASE_LTI_PARAMS
self.assertEquals(lti.user_fullname(), 'Foo Bar Baz')
self.assertEqual(lti.user_fullname(), 'Foo Bar Baz')

def test_user_roles(self):
lti = LTI('initial', 'any')
self.assertEquals(lti.user_roles(), [])
self.assertEqual(lti.user_roles(), [])

lti.lti_params = BASE_LTI_PARAMS
self.assertEquals(lti.user_roles(), [
self.assertEqual(lti.user_roles(), [
u'urn:lti:instrole:ims/lis/instructor',
u'urn:lti:instrole:ims/lis/staff'])

Expand All @@ -54,7 +54,7 @@ def test_consumers(self):
lti = LTI('any', 'any')

with self.settings(PYLTI_CONFIG={'consumers': CONSUMERS}):
self.assertEquals(lti._consumers(), CONSUMERS)
self.assertEqual(lti._consumers(), CONSUMERS)

def test_verify_any(self):
lti = LTI('any', 'any')
Expand Down
26 changes: 13 additions & 13 deletions lti_auth/tests/test_views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def test_launch_invalid_user(self):
request = generate_lti_request()

response = LTIRoutingView().dispatch(request)
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)

self.assertContains(response, 'Authentication Failed')
self.assertFalse(request.session[LTI_SESSION_KEY])
Expand All @@ -64,7 +64,7 @@ def test_launch_invalid_course(self):
request = generate_lti_request()

response = LTIRoutingView().dispatch(request)
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)

self.assertContains(response, 'Course Configuration')

Expand All @@ -78,17 +78,17 @@ def test_launch(self):
view.request = request

response = view.dispatch(request)
self.assertEquals(response.status_code, 302)
self.assertEqual(response.status_code, 302)

landing = '/lti/landing/{}/?lti_version=LTI-1p0&'
self.assertEquals(
self.assertEqual(
response.url, landing.format(ctx.lms_course_context))

self.assertIsNotNone(request.session[LTI_SESSION_KEY])
user = request.user
self.assertFalse(user.has_usable_password())
self.assertEquals(user.email, '[email protected]')
self.assertEquals(user.get_full_name(), 'Foo Baz')
self.assertEqual(user.email, '[email protected]')
self.assertEqual(user.get_full_name(), 'Foo Baz')
self.assertTrue(user in ctx.group.user_set.all())
self.assertTrue(user in ctx.faculty_group.user_set.all())

Expand All @@ -103,16 +103,16 @@ def test_launch_custom_landing_page(self):

response = view.dispatch(request)
landing = 'http://testserver/lti/landing/{}/?lti_version=LTI-1p0&'
self.assertEquals(response.status_code, 302)
self.assertEqual(response.status_code, 302)
self.assertTrue(
response.url,
landing.format(ctx.lms_course_context))

self.assertIsNotNone(request.session[LTI_SESSION_KEY])
user = request.user
self.assertFalse(user.has_usable_password())
self.assertEquals(user.email, '[email protected]')
self.assertEquals(user.get_full_name(), 'Foo Baz')
self.assertEqual(user.email, '[email protected]')
self.assertEqual(user.get_full_name(), 'Foo Baz')
self.assertTrue(user in ctx.group.user_set.all())
self.assertTrue(user in ctx.faculty_group.user_set.all())

Expand All @@ -126,16 +126,16 @@ def test_embed(self):
view.request = request

response = view.dispatch(request)
self.assertEquals(response.status_code, 302)
self.assertEquals(
self.assertEqual(response.status_code, 302)
self.assertEqual(
response.url,
'http://testserver/asset/embed/?return_url=/asset/'
'&lti_version=LTI-1p0&')

self.assertIsNotNone(request.session[LTI_SESSION_KEY])
user = request.user
self.assertFalse(user.has_usable_password())
self.assertEquals(user.email, '[email protected]')
self.assertEquals(user.get_full_name(), 'Foo Baz')
self.assertEqual(user.email, '[email protected]')
self.assertEqual(user.get_full_name(), 'Foo Baz')
self.assertTrue(user in ctx.group.user_set.all())
self.assertTrue(user in ctx.faculty_group.user_set.all())
4 changes: 2 additions & 2 deletions mediathread/assetmgr/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from django.core.cache import cache
from django.urls import reverse
from django.db import models
from django.utils.encoding import smart_text
from django.utils.encoding import smart_str
from tagging.models import Tag

from mediathread.assetmgr.custom_storage import private_storage
Expand Down Expand Up @@ -378,7 +378,7 @@ class Source(models.Model):
auto_now=True)

def __str__(self):
return '[%s] %s' % (self.label, smart_text(self.asset))
return '[%s] %s' % (self.label, smart_str(self.asset))

def is_image(self):
return (self.label == 'poster' or
Expand Down
Loading

0 comments on commit e6ab2a3

Please sign in to comment.