Skip to content

Commit 99abc15

Browse files
irfanuddinahmadirfanuddinahmad
committed
fix: fixed tests
1 parent 4c7fa4a commit 99abc15

7 files changed

Lines changed: 13 additions & 42 deletions

File tree

‎cms/djangoapps/contentstore/rest_api/v1/serializers/course_waffle_flags.py‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,15 @@ def get_use_new_advanced_settings_page(self, obj):
8181

8282
def get_use_new_grading_page(self, obj):
8383
"""
84-
Method to get the use_new_grading_page switch
84+
Method to indicate whether we should use the new grading page.
85+
86+
This used to be based on a waffle flag but the flag is being removed so we
87+
default it to true for now until we can remove the need for it from the consumers
88+
of this serializer and the related APIs.
89+
90+
See https://github.com/openedx/edx-platform/issues/36275
8591
"""
86-
course_key = self.get_course_key()
87-
return toggles.use_new_grading_page(course_key)
92+
return True
8893

8994
def get_use_new_updates_page(self, obj):
9095
"""

‎cms/djangoapps/contentstore/tests/test_contentstore.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1500,8 +1500,7 @@ def test_get_json(handler):
15001500
with override_waffle_flag(toggles.LEGACY_STUDIO_SCHEDULE_DETAILS, True):
15011501
test_get_html('settings_handler')
15021502
with override_settings(COURSE_AUTHORING_MICROFRONTEND_URL='https://mfe.example'):
1503-
with override_waffle_flag(toggles.LEGACY_STUDIO_GRADING, False):
1504-
test_get_html('grading_handler')
1503+
test_get_html('grading_handler')
15051504
with override_waffle_flag(toggles.LEGACY_STUDIO_ADVANCED_SETTINGS, True):
15061505
test_get_html('advanced_settings_handler')
15071506
test_get_json('textbooks_list_handler')

‎cms/djangoapps/contentstore/tests/test_course_settings.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ def test_discussion_fields_available(self, is_pages_and_resources_enabled,
168168
@override_waffle_flag(toggles.LEGACY_STUDIO_EXPORT, True)
169169
@override_waffle_flag(toggles.LEGACY_STUDIO_COURSE_TEAM, True)
170170
@override_waffle_flag(toggles.LEGACY_STUDIO_SCHEDULE_DETAILS, True)
171-
@override_waffle_flag(toggles.LEGACY_STUDIO_GRADING, False)
172171
def test_disable_advanced_settings_feature(self, disable_advanced_settings):
173172
"""
174173
If this feature is enabled, only Django Staff/Superuser should be able to access the "Advanced Settings" page.

‎cms/djangoapps/contentstore/toggles.py‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -216,24 +216,6 @@ def use_new_advanced_settings_page(course_key):
216216
return not LEGACY_STUDIO_ADVANCED_SETTINGS.is_enabled(course_key)
217217

218218

219-
# .. toggle_name: legacy_studio.grading
220-
# .. toggle_implementation: WaffleFlag
221-
# .. toggle_default: False
222-
# .. toggle_description: Temporarily fall back to the old Studio Course Grading page.
223-
# .. toggle_use_cases: temporary
224-
# .. toggle_creation_date: 2025-03-14
225-
# .. toggle_target_removal_date: 2025-09-14
226-
# .. toggle_tickets: https://github.com/openedx/edx-platform/issues/36275
227-
# .. toggle_warning: In Ulmo, this toggle will be removed. Only the new (React-based) experience will be available.
228-
LEGACY_STUDIO_GRADING = CourseWaffleFlag('legacy_studio.grading', __name__)
229-
230-
231-
def use_new_grading_page(course_key):
232-
"""
233-
Returns a boolean if new studio grading mfe is enabled
234-
"""
235-
return not LEGACY_STUDIO_GRADING.is_enabled(course_key)
236-
237219

238220
# .. toggle_name: legacy_studio.import
239221
# .. toggle_implementation: WaffleFlag

‎cms/djangoapps/contentstore/utils.py‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
use_new_certificates_page,
4646
use_new_course_team_page,
4747
use_new_export_page,
48-
use_new_grading_page,
4948
use_new_group_configurations_page,
5049
use_new_import_page,
5150
use_new_schedule_details_page,
@@ -330,13 +329,10 @@ def get_grading_url(course_locator) -> str:
330329
"""
331330
Gets course authoring microfrontend URL for grading page view.
332331
"""
333-
grading_url = None
334-
if use_new_grading_page(course_locator):
335-
mfe_base_url = get_course_authoring_url(course_locator)
336-
course_mfe_url = f'{mfe_base_url}/course/{course_locator}/settings/grading'
337-
if mfe_base_url:
338-
grading_url = course_mfe_url
339-
return grading_url
332+
mfe_base_url = get_course_authoring_url(course_locator)
333+
if mfe_base_url:
334+
return f'{mfe_base_url}/course/{course_locator}/settings/grading'
335+
return None
340336

341337

342338
def get_course_team_url(course_locator) -> str:

‎cms/djangoapps/contentstore/views/tests/test_exam_settings_view.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
@override_waffle_flag(toggles.LEGACY_STUDIO_CERTIFICATES, True)
2828
@override_waffle_flag(toggles.LEGACY_STUDIO_SCHEDULE_DETAILS, True)
2929
@override_waffle_flag(toggles.LEGACY_STUDIO_CONFIGURATIONS, True)
30-
@override_waffle_flag(toggles.LEGACY_STUDIO_GRADING, False)
3130
@override_waffle_flag(toggles.LEGACY_STUDIO_ADVANCED_SETTINGS, True)
3231
@override_settings(COURSE_AUTHORING_MICROFRONTEND_URL='https://mfe.example')
3332
class TestExamSettingsView(CourseTestCase, UrlResetMixin):

‎cms/templates/widgets/header.html‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ <h1 class="branding">
3838
course_info_url = reverse('course_info_handler', kwargs={'course_key_string': str(course_key)})
3939
export_url = reverse('export_handler', kwargs={'course_key_string': str(course_key)})
4040
settings_url = reverse('settings_handler', kwargs={'course_key_string': str(course_key)})
41-
grading_url = reverse('grading_handler', kwargs={'course_key_string': str(course_key)})
4241
advanced_settings_url = reverse('advanced_settings_handler', kwargs={'course_key_string': str(course_key)})
4342
tabs_url = reverse('tabs_handler', kwargs={'course_key_string': str(course_key)})
4443
certificates_url = ''
@@ -47,7 +46,6 @@ <h1 class="branding">
4746
checklists_url = reverse('checklists_handler', kwargs={'course_key_string': str(course_key)})
4847
pages_and_resources_mfe_enabled = ENABLE_PAGES_AND_RESOURCES_MICROFRONTEND.is_enabled(context_course.id)
4948
schedule_details_mfe_enabled = toggles.use_new_schedule_details_page(context_course.id)
50-
grading_mfe_enabled = toggles.use_new_grading_page(context_course.id)
5149
course_team_mfe_enabled = toggles.use_new_course_team_page(context_course.id)
5250
advanced_settings_mfe_enabled = toggles.use_new_advanced_settings_page(context_course.id)
5351
import_mfe_enabled = toggles.use_new_import_page(context_course.id)
@@ -128,16 +126,9 @@ <h3 class="title"><span class="label"><span class="label-prefix sr">${_("Course"
128126
<a href="${get_schedule_details_url(course_key)}">${_("Schedule & Details")}</a>
129127
</li>
130128
% endif
131-
% if not grading_mfe_enabled:
132-
<li class="nav-item nav-course-settings-grading">
133-
<a href="${grading_url}">${_("Grading")}</a>
134-
</li>
135-
% endif
136-
% if grading_mfe_enabled:
137129
<li class="nav-item nav-course-settings-grading">
138130
<a href="${get_grading_url(course_key)}">${_("Grading")}</a>
139131
</li>
140-
% endif
141132
% if not course_team_mfe_enabled:
142133
<li class="nav-item nav-course-settings-team">
143134
<a href="${course_team_url}">${_("Course Team")}</a>

0 commit comments

Comments
 (0)