From cdf26039e6c2d46565ddff5db926d649ef25e355 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Wed, 19 Mar 2025 13:16:57 -0400 Subject: [PATCH] test: Remove reference to the `courseware` url. The courseware URL is going away but it's just used here to test the middleware. That can be test with other urls that are relevant to this middleware. Note, I was unable to re-produce the failures so I've put back using the standard `reverse` logic for fetching the URL in the test. --- lms/djangoapps/courseware/tests/test_navigation.py | 5 +++-- openedx/core/djangoapps/user_api/tests/test_middleware.py | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lms/djangoapps/courseware/tests/test_navigation.py b/lms/djangoapps/courseware/tests/test_navigation.py index 82b27a5bd6..7d6e8cf043 100644 --- a/lms/djangoapps/courseware/tests/test_navigation.py +++ b/lms/djangoapps/courseware/tests/test_navigation.py @@ -17,6 +17,7 @@ from xmodule.modulestore.tests.factories import CourseFactory, BlockFactory from common.djangoapps.student.tests.factories import GlobalStaffFactory from lms.djangoapps.courseware.tests.helpers import LoginEnrollmentTestCase, set_preview_mode from openedx.features.course_experience import DISABLE_COURSE_OUTLINE_PAGE_FLAG +from openedx.features.course_experience.url_helpers import make_learning_mfe_courseware_url @set_preview_mode(True) @@ -111,7 +112,7 @@ class TestNavigation(SharedModuleStoreTestCase, LoginEnrollmentTestCase): assert ('course-navigation' in response.content.decode('utf-8')) == accordion self.assertTabInactive('progress', response) - self.assertTabActive('courseware', response) + self.assertTabActive(make_learning_mfe_courseware_url(self.course.id), response) response = self.client.get(reverse('courseware_section', kwargs={ 'course_id': str(self.course.id), @@ -120,7 +121,7 @@ class TestNavigation(SharedModuleStoreTestCase, LoginEnrollmentTestCase): })) self.assertTabActive('progress', response) - self.assertTabInactive('courseware', response) + self.assertTabInactive(make_learning_mfe_courseware_url(self.course.id), response) @override_settings(SESSION_INACTIVITY_TIMEOUT_IN_SECONDS=1) def test_inactive_session_timeout(self): diff --git a/openedx/core/djangoapps/user_api/tests/test_middleware.py b/openedx/core/djangoapps/user_api/tests/test_middleware.py index e19a115286..04b5b41049 100644 --- a/openedx/core/djangoapps/user_api/tests/test_middleware.py +++ b/openedx/core/djangoapps/user_api/tests/test_middleware.py @@ -5,6 +5,7 @@ from unittest.mock import Mock, patch from django.http import HttpResponse from django.test import TestCase from django.test.client import RequestFactory +from django.urls import reverse from common.djangoapps.student.tests.factories import AnonymousUserFactory, UserFactory from openedx.core.djangolib.testing.utils import skip_unless_lms @@ -29,9 +30,7 @@ class TagsMiddlewareTest(TestCase): self.course_id = 'mock/course/id' self.request_factory = RequestFactory() - # TODO: Make it so we can use reverse. Appears to fail depending on the order in which tests are run - #self.request = RequestFactory().get(reverse('courseware', kwargs={'course_id': self.course_id})) - self.request = RequestFactory().get(f'/courses/{self.course_id}/courseware') + self.request = RequestFactory().get(reverse('progress', kwargs={'course_id': self.course_id})) self.request.user = self.user self.response = Mock(spec=HttpResponse)