Skip to content
Snippets Groups Projects
Commit 68988de0 authored by Bermudez, Jaime's avatar Bermudez, Jaime
Browse files

Remove apparently unneeded INSTALLED_APPS setting, as well as the...

Remove apparently unneeded INSTALLED_APPS setting, as well as the LTI_CUSTOM_ROLE_KEY setting.  Update middleware to use hasattr instead of getattr.  Update tests to set the LTI_CUSTOM_ROLE_KEY django setting with a context manager block in each required test.
parent b1f19f1b
No related branches found
No related tags found
No related merge requests found
......@@ -94,7 +94,7 @@ class LTIAuthMiddleware(object):
'roles': request.POST.get('roles', '').split(','),
}
# If a custom role key is defined in project, merge into existing role list
if getattr(settings, 'LTI_CUSTOM_ROLE_KEY', None):
if hasattr(settings, 'LTI_CUSTOM_ROLE_KEY'):
custom_roles = request.POST.get(settings.LTI_CUSTOM_ROLE_KEY, '').split(',')
lti_launch['roles'] += filter(None, custom_roles) # Filter out any empty roles
......
......@@ -24,7 +24,6 @@ class TestLTIAuthMiddleware(unittest.TestCase):
request.session = {}
return request
@patch('django_auth_lti.middleware.settings.LTI_CUSTOM_ROLE_KEY', 'test_custom_role_key')
@patch('django_auth_lti.middleware.auth')
def test_roles_merged_with_custom_roles(self, mock_auth, mock_logger):
"""
......@@ -35,10 +34,10 @@ class TestLTIAuthMiddleware(unittest.TestCase):
'roles': 'RoleOne,RoleTwo',
'test_custom_role_key': 'My,Custom,Roles',
})
self.mw.process_request(request)
with patch('django_auth_lti.middleware.settings', LTI_CUSTOM_ROLE_KEY='test_custom_role_key'):
self.mw.process_request(request)
self.assertEqual(request.session['LTI_LAUNCH']['roles'], ['RoleOne', 'RoleTwo', 'My', 'Custom', 'Roles'])
@patch('django_auth_lti.middleware.settings.LTI_CUSTOM_ROLE_KEY', 'test_custom_role_key')
@patch('django_auth_lti.middleware.auth')
def test_roles_merge_with_empty_custom_roles(self, mock_auth, mock_logger):
"""
......@@ -48,10 +47,10 @@ class TestLTIAuthMiddleware(unittest.TestCase):
'roles': 'RoleOne,RoleTwo',
'test_custom_role_key': '',
})
self.mw.process_request(request)
with patch('django_auth_lti.middleware.settings', LTI_CUSTOM_ROLE_KEY='test_custom_role_key'):
self.mw.process_request(request)
self.assertEqual(request.session['LTI_LAUNCH']['roles'], ['RoleOne', 'RoleTwo'])
@patch('django_auth_lti.middleware.settings.LTI_CUSTOM_ROLE_KEY', None)
@patch('django_auth_lti.middleware.auth')
def test_roles_not_merged_with_no_role_key(self, mock_auth, mock_logger):
"""
......
......@@ -5,12 +5,9 @@ from django.conf import settings
def runtests():
settings.configure(
INSTALLED_APPS=(
'django_auth_lti',
),
# App-specific setttings
LTI_CUSTOM_ROLE_KEY='change-me',
# App-specific setttings here
)
# settings must be configured for this import to work
from django.test.runner import DiscoverRunner
DiscoverRunner(interactive=False, failfast=False).run_tests(['django_auth_lti'])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment