Skip to content
Draft
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/ccx/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from edx_django_utils.cache import RequestCache
from opaque_keys.edx.keys import CourseKey
from pytz import UTC
from xblocks_contrib.problem.capa.tests.response_xml_factory import StringResponseXMLFactory
from xblocks_contrib.problem.capa.testing.response_xml_factory import StringResponseXMLFactory

from common.djangoapps.edxmako.shortcuts import render_to_response
from common.djangoapps.student.models import CourseEnrollment, CourseEnrollmentAllowed
Expand Down
2 changes: 1 addition & 1 deletion lms/djangoapps/courseware/tests/test_block_render.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
Mixologist, # pylint: disable=wrong-import-order
)
from xblock.test.tools import TestRuntime # pylint: disable=wrong-import-order
from xblocks_contrib.problem.capa.tests.response_xml_factory import (
from xblocks_contrib.problem.capa.testing.response_xml_factory import (
OptionResponseXMLFactory, # pylint: disable=reimported
)

Expand Down
2 changes: 1 addition & 1 deletion lms/djangoapps/courseware/tests/test_entrance_exam.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from django.test import override_settings
from django.urls import reverse
from milestones.tests.utils import MilestonesTestCaseMixin
from xblocks_contrib.problem.capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory
from xblocks_contrib.problem.capa.testing.response_xml_factory import MultipleChoiceResponseXMLFactory

from common.djangoapps.student.models import CourseEnrollment
from common.djangoapps.student.tests.factories import (
Expand Down
2 changes: 1 addition & 1 deletion lms/djangoapps/courseware/tests/test_masquerade.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from django.urls import reverse
from pytz import UTC
from xblock.runtime import DictKeyValueStore
from xblocks_contrib.problem.capa.tests.response_xml_factory import OptionResponseXMLFactory
from xblocks_contrib.problem.capa.testing.response_xml_factory import OptionResponseXMLFactory

from common.djangoapps.student.models import CourseEnrollment
from common.djangoapps.student.tests.factories import StaffFactory, UserFactory
Expand Down
4 changes: 2 additions & 2 deletions lms/djangoapps/courseware/tests/test_submitting_problems.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
from django.urls import reverse
from django.utils.timezone import now
from submissions import api as submissions_api
from xblocks_contrib.problem.capa.tests.response_xml_factory import (
from xblocks_contrib.problem.capa.testing.codejail import UseUnsafeCodejail
from xblocks_contrib.problem.capa.testing.response_xml_factory import (
CodeResponseXMLFactory,
CustomResponseXMLFactory,
OptionResponseXMLFactory,
SchematicResponseXMLFactory,
)
from xblocks_contrib.problem.capa.tests.test_util import UseUnsafeCodejail
from xblocks_contrib.problem.capa.xqueue_interface import XQueueInterface

from common.djangoapps.course_modes.models import CourseMode
Expand Down
2 changes: 1 addition & 1 deletion lms/djangoapps/courseware/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
from xblock.core import XBlock
from xblock.fields import Scope, String
from xblock.scorable import ShowCorrectness
from xblocks_contrib.problem.capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory
from xblocks_contrib.problem.capa.testing.response_xml_factory import MultipleChoiceResponseXMLFactory

import lms.djangoapps.courseware.views.views as views
from common.djangoapps.course_modes.models import CourseMode
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import ddt
from django.urls import reverse
from pytz import UTC
from xblocks_contrib.problem.capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory
from xblocks_contrib.problem.capa.testing.response_xml_factory import MultipleChoiceResponseXMLFactory

from common.djangoapps.student.tests.factories import GlobalStaffFactory, StaffFactory, UserFactory
from openedx.core.djangoapps.oauth_dispatch.tests.factories import AccessTokenFactory, ApplicationFactory
Expand Down
2 changes: 1 addition & 1 deletion lms/djangoapps/grades/tests/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@


from crum import set_current_request
from xblocks_contrib.problem.capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory
from xblocks_contrib.problem.capa.testing.response_xml_factory import MultipleChoiceResponseXMLFactory

from common.djangoapps.student.models import CourseEnrollment
from common.djangoapps.student.tests.factories import UserFactory
Expand Down
2 changes: 1 addition & 1 deletion lms/djangoapps/grades/tests/integration/test_access.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@


from crum import set_current_request
from xblocks_contrib.problem.capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory
from xblocks_contrib.problem.capa.testing.response_xml_factory import MultipleChoiceResponseXMLFactory

from common.djangoapps.student.models import CourseEnrollment
from common.djangoapps.student.tests.factories import UserFactory
Expand Down
2 changes: 1 addition & 1 deletion lms/djangoapps/grades/tests/integration/test_events.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import ddt
from crum import set_current_request
from xblocks_contrib.problem.capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory
from xblocks_contrib.problem.capa.testing.response_xml_factory import MultipleChoiceResponseXMLFactory

import openedx.core.djangoapps.content.block_structure.api as bs_api
from common.djangoapps.student.models import CourseEnrollment
Expand Down
2 changes: 1 addition & 1 deletion lms/djangoapps/grades/tests/integration/test_problems.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import pytz
from crum import set_current_request
from django.test.utils import override_settings
from xblocks_contrib.problem.capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory
from xblocks_contrib.problem.capa.testing.response_xml_factory import MultipleChoiceResponseXMLFactory

from common.djangoapps.student.models import CourseEnrollment
from common.djangoapps.student.tests.factories import UserFactory
Expand Down
2 changes: 1 addition & 1 deletion lms/djangoapps/instructor/tests/test_enrollment.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from django.utils.translation import override as override_language
from opaque_keys.edx.locator import CourseLocator
from submissions import api as sub_api
from xblocks_contrib.problem.capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory
from xblocks_contrib.problem.capa.testing.response_xml_factory import MultipleChoiceResponseXMLFactory

from common.djangoapps.student.models import CourseEnrollment, CourseEnrollmentAllowed, anonymous_id_for_user
from common.djangoapps.student.roles import CourseCcxCoachRole
Expand Down
2 changes: 1 addition & 1 deletion lms/djangoapps/instructor/tests/test_spoc_gradebook.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Tests of the instructor dashboard spoc gradebook
"""
from django.urls import reverse
from xblocks_contrib.problem.capa.tests.response_xml_factory import StringResponseXMLFactory
from xblocks_contrib.problem.capa.testing.response_xml_factory import StringResponseXMLFactory

from common.djangoapps.student.tests.factories import AdminFactory, CourseEnrollmentFactory, UserFactory
from lms.djangoapps.courseware.tests.factories import StudentModuleFactory
Expand Down
2 changes: 1 addition & 1 deletion lms/djangoapps/instructor_task/tests/test_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from django.urls import reverse
from opaque_keys.edx.keys import CourseKey
from opaque_keys.edx.locations import Location
from xblocks_contrib.problem.capa.tests.response_xml_factory import OptionResponseXMLFactory
from xblocks_contrib.problem.capa.testing.response_xml_factory import OptionResponseXMLFactory

from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
from lms.djangoapps.courseware.model_data import StudentModule
Expand Down
4 changes: 2 additions & 2 deletions lms/djangoapps/instructor_task/tests/test_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
from django.test.utils import override_settings
from django.urls import reverse
from xblocks_contrib.problem.capa.responsetypes import StudentInputError
from xblocks_contrib.problem.capa.tests.response_xml_factory import CodeResponseXMLFactory, CustomResponseXMLFactory
from xblocks_contrib.problem.capa.tests.test_util import UseUnsafeCodejail
from xblocks_contrib.problem.capa.testing.codejail import UseUnsafeCodejail
from xblocks_contrib.problem.capa.testing.response_xml_factory import CodeResponseXMLFactory, CustomResponseXMLFactory

from common.test.utils import assert_dict_contains_subset
from lms.djangoapps.courseware.model_data import StudentModule
Expand Down
2 changes: 1 addition & 1 deletion lms/djangoapps/instructor_task/tests/test_tasks_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from edx_django_utils.cache import RequestCache
from freezegun import freeze_time
from pytz import UTC
from xblocks_contrib.problem.capa.tests.response_xml_factory import (
from xblocks_contrib.problem.capa.testing.response_xml_factory import (
MultipleChoiceResponseXMLFactory, # pylint: disable=wrong-import-order
)

Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1311,7 +1311,7 @@ xblock-google-drive==0.8.2
# via -r requirements/edx/bundled.in
xblock-poll==1.16.1
# via -r requirements/edx/bundled.in
xblocks-contrib==0.17.0
xblocks-contrib @ git+https://github.com/AhtishamShahid/xblocks-core@f532c455cd7210511075c6eaf7d0a265a43ebb65
# via -r requirements/edx/bundled.in
xmlsec==1.3.14
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/development.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2319,7 +2319,7 @@ xblock-poll==1.16.1
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
xblocks-contrib==0.17.0
xblocks-contrib @ git+https://github.com/AhtishamShahid/xblocks-core@f532c455cd7210511075c6eaf7d0a265a43ebb65
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1651,7 +1651,7 @@ xblock-google-drive==0.8.2
# via -r requirements/edx/base.txt
xblock-poll==1.16.1
# via -r requirements/edx/base.txt
xblocks-contrib==0.17.0
xblocks-contrib @ git+https://github.com/AhtishamShahid/xblocks-core@f532c455cd7210511075c6eaf7d0a265a43ebb65
# via -r requirements/edx/base.txt
xmlsec==1.3.14
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1730,7 +1730,7 @@ xblock-google-drive==0.8.2
# via -r requirements/edx/base.txt
xblock-poll==1.16.1
# via -r requirements/edx/base.txt
xblocks-contrib==0.17.0
xblocks-contrib @ git+https://github.com/AhtishamShahid/xblocks-core@f532c455cd7210511075c6eaf7d0a265a43ebb65
# via -r requirements/edx/base.txt
xmlsec==1.3.14
# via
Expand Down
2 changes: 1 addition & 1 deletion xmodule/tests/test_capa_block.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
from xblocks_contrib.problem.capa import responsetypes
from xblocks_contrib.problem.capa.correctmap import CorrectMap
from xblocks_contrib.problem.capa.responsetypes import LoncapaProblemError, ResponseError, StudentInputError
from xblocks_contrib.problem.capa.tests.test_util import UseUnsafeCodejail
from xblocks_contrib.problem.capa.testing.codejail import UseUnsafeCodejail
from xblocks_contrib.problem.capa.xqueue_interface import XQueueInterface

from lms.djangoapps.courseware.user_state_client import XBlockUserState
Expand Down
Loading