Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: Remove the django-splash app. #34528

Merged
merged 3 commits into from
Apr 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lms/djangoapps/certificates/apis/v0/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ def test_no_certificate(self):
def test_query_counts(self):
# Test student with no certificates
student_no_cert = UserFactory.create(password=self.user_password)
with self.assertNumQueries(21, table_ignorelist=WAFFLE_TABLES):
with self.assertNumQueries(20, table_ignorelist=WAFFLE_TABLES):
resp = self.get_response(
AuthType.jwt,
requesting_user=self.global_staff,
Expand Down
2 changes: 1 addition & 1 deletion lms/djangoapps/course_api/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ def test_too_many_courses(self):
self.setup_user(self.audit_user)

# These query counts were found empirically
query_counts = [53, 46, 46, 46, 46, 46, 46, 46, 46, 46, 16]
query_counts = [52, 46, 46, 46, 46, 46, 46, 46, 46, 46, 16]
ordered_course_ids = sorted([str(cid) for cid in (course_ids + [c.id for c in self.courses])])

self.clear_caches()
Expand Down
8 changes: 4 additions & 4 deletions lms/djangoapps/courseware/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ def test_index_query_counts(self):
self.client.login(username=self.user.username, password=self.user_password)
CourseEnrollment.enroll(self.user, course.id)

with self.assertNumQueries(178, table_ignorelist=QUERY_COUNT_TABLE_IGNORELIST):
with self.assertNumQueries(177, table_ignorelist=QUERY_COUNT_TABLE_IGNORELIST):
with check_mongo_calls(3):
url = reverse(
'courseware_section',
Expand Down Expand Up @@ -1496,8 +1496,8 @@ def test_view_certificate_link(self):
self.assertContains(resp, "earned a certificate for this course.")

@ddt.data(
(True, 54),
(False, 54),
(True, 53),
(False, 53),
)
@ddt.unpack
def test_progress_queries_paced_courses(self, self_paced, query_count):
Expand All @@ -1512,7 +1512,7 @@ def test_progress_queries(self):
ContentTypeGatingConfig.objects.create(enabled=True, enabled_as_of=datetime(2018, 1, 1))
self.setup_course()
with self.assertNumQueries(
54, table_ignorelist=QUERY_COUNT_TABLE_IGNORELIST
53, table_ignorelist=QUERY_COUNT_TABLE_IGNORELIST
), check_mongo_calls(2):
self._get_progress_page()

Expand Down
4 changes: 2 additions & 2 deletions lms/djangoapps/discussion/django_comment_client/base/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -410,15 +410,15 @@ def inner(self, default_store, block_count, mongo_calls, sql_queries, *args, **k
return inner

@ddt.data(
(ModuleStoreEnum.Type.split, 3, 8, 43),
(ModuleStoreEnum.Type.split, 3, 8, 42),
)
@ddt.unpack
@count_queries
def test_create_thread(self, mock_request):
self.create_thread_helper(mock_request)

@ddt.data(
(ModuleStoreEnum.Type.split, 3, 6, 42),
(ModuleStoreEnum.Type.split, 3, 6, 41),
)
@ddt.unpack
@count_queries
Expand Down
5 changes: 0 additions & 5 deletions lms/envs/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -2286,8 +2286,6 @@ def _make_locale_paths(settings): # pylint: disable=missing-function-docstring
'openedx.core.djangoapps.cors_csrf.middleware.CorsCSRFMiddleware',
'openedx.core.djangoapps.cors_csrf.middleware.CsrfCrossDomainCookieMiddleware',

'splash.middleware.SplashMiddleware',

'openedx.core.djangoapps.geoinfo.middleware.CountryMiddleware',
'openedx.core.djangoapps.embargo.middleware.EmbargoMiddleware',

Expand Down Expand Up @@ -3162,9 +3160,6 @@ def _make_locale_paths(settings): # pylint: disable=missing-function-docstring
# Notes
'lms.djangoapps.edxnotes',

# Splash screen
'splash',

# User API
'rest_framework',

Expand Down
12 changes: 6 additions & 6 deletions openedx/core/djangoapps/user_api/accounts/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ def test_get_username(self):
Test that a client (logged in) can get her own username.
"""
self.client.login(username=self.user.username, password=TEST_PASSWORD)
self._verify_get_own_username(19)
self._verify_get_own_username(18)

def test_get_username_inactive(self):
"""
Expand All @@ -242,7 +242,7 @@ def test_get_username_inactive(self):
self.client.login(username=self.user.username, password=TEST_PASSWORD)
self.user.is_active = False
self.user.save()
self._verify_get_own_username(19)
self._verify_get_own_username(18)

def test_get_username_not_logged_in(self):
"""
Expand All @@ -251,7 +251,7 @@ def test_get_username_not_logged_in(self):
"""

# verify that the endpoint is inaccessible when not logged in
self._verify_get_own_username(12, expected_status=401)
self._verify_get_own_username(11, expected_status=401)


@skip_unless_lms
Expand Down Expand Up @@ -358,7 +358,7 @@ class TestAccountsAPI(FilteredQueryCountMixin, CacheIsolationTestCase, UserAPITe
"""

ENABLED_CACHES = ['default']
TOTAL_QUERY_COUNT = 27
TOTAL_QUERY_COUNT = 26
FULL_RESPONSE_FIELD_COUNT = 29

def setUp(self):
Expand Down Expand Up @@ -811,7 +811,7 @@ def verify_get_own_information(queries):
assert data['time_zone'] is None

self.client.login(username=self.user.username, password=TEST_PASSWORD)
verify_get_own_information(self._get_num_queries(25))
verify_get_own_information(self._get_num_queries(24))

# Now make sure that the user can get the same information, even if not active
self.user.is_active = False
Expand All @@ -831,7 +831,7 @@ def test_get_account_empty_string(self):
legacy_profile.save()

self.client.login(username=self.user.username, password=TEST_PASSWORD)
with self.assertNumQueries(self._get_num_queries(25), table_ignorelist=WAFFLE_TABLES):
with self.assertNumQueries(self._get_num_queries(24), table_ignorelist=WAFFLE_TABLES):
response = self.send_get(self.client)
for empty_field in ("level_of_education", "gender", "country", "state", "bio",):
assert response.data[empty_field] is None
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def test_queries(self):

# Fetch the view and verify that the query counts haven't changed
# TODO: decrease query count as part of REVO-28
with self.assertNumQueries(53, table_ignorelist=QUERY_COUNT_TABLE_IGNORELIST):
with self.assertNumQueries(52, table_ignorelist=QUERY_COUNT_TABLE_IGNORELIST):
with check_mongo_calls(3):
url = course_updates_url(self.course)
self.client.get(url)
3 changes: 0 additions & 3 deletions requirements/edx/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,6 @@ django==4.2.10
# django-oauth-toolkit
# django-sekizai
# django-ses
# django-splash
# django-statici18n
# django-storages
# django-user-tasks
Expand Down Expand Up @@ -349,8 +348,6 @@ django-simple-history==3.4.0
# edx-organizations
# edx-proctoring
# ora2
django-splash==1.3.0
# via -r requirements/edx/kernel.in
django-statici18n==2.4.0
# via
# -r requirements/edx/kernel.in
Expand Down
5 changes: 0 additions & 5 deletions requirements/edx/development.txt
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,6 @@ django==4.2.10
# django-oauth-toolkit
# django-sekizai
# django-ses
# django-splash
# django-statici18n
# django-storages
# django-stubs
Expand Down Expand Up @@ -567,10 +566,6 @@ django-simple-history==3.4.0
# edx-organizations
# edx-proctoring
# ora2
django-splash==1.3.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
django-statici18n==2.4.0
# via
# -r requirements/edx/doc.txt
Expand Down
3 changes: 0 additions & 3 deletions requirements/edx/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@ django==4.2.10
# django-oauth-toolkit
# django-sekizai
# django-ses
# django-splash
# django-statici18n
# django-storages
# django-user-tasks
Expand Down Expand Up @@ -415,8 +414,6 @@ django-simple-history==3.4.0
# edx-organizations
# edx-proctoring
# ora2
django-splash==1.3.0
# via -r requirements/edx/base.txt
django-statici18n==2.4.0
# via
# -r requirements/edx/base.txt
Expand Down
1 change: 0 additions & 1 deletion requirements/edx/kernel.in
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ django-pipeline
django-ratelimit
django-sekizai
django-simple-history
django-splash
django-statici18n
django-storages
django-user-tasks
Expand Down
3 changes: 0 additions & 3 deletions requirements/edx/testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,6 @@ django==4.2.10
# django-oauth-toolkit
# django-sekizai
# django-ses
# django-splash
# django-statici18n
# django-storages
# django-user-tasks
Expand Down Expand Up @@ -444,8 +443,6 @@ django-simple-history==3.4.0
# edx-organizations
# edx-proctoring
# ora2
django-splash==1.3.0
# via -r requirements/edx/base.txt
django-statici18n==2.4.0
# via
# -r requirements/edx/base.txt
Expand Down
Loading