Skip to content
Closed
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ source =
cms
common/djangoapps
common/lib/capa
common/lib/xmodule
lms
openedx
pavelib
scripts
xmodule

omit =
cms/envs/*
Expand Down
2 changes: 1 addition & 1 deletion .coveragerc-local
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ source =
cms
common/djangoapps
common/lib/capa
common/lib/xmodule
lms
openedx
pavelib
scripts
xmodule

omit =
cms/envs/*
Expand Down
12 changes: 6 additions & 6 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,19 @@ common/lib/capa/capa/tests/test_files/js/test_problem_display.js
common/lib/capa/capa/tests/test_files/js/test_problem_generator.js
common/lib/capa/capa/tests/test_files/js/test_problem_grader.js
common/lib/capa/capa/tests/test_files/js/xproblem.js
common/lib/xmodule/xmodule/js/spec/annotatable/display_spec.js
common/lib/xmodule/xmodule/js/spec/capa/display_spec.js
common/lib/xmodule/xmodule/js/spec/html/edit_spec.js
common/lib/xmodule/xmodule/js/spec/problem/edit_spec_hint.js
common/lib/xmodule/xmodule/js/spec/problem/edit_spec.js
common/lib/xmodule/xmodule/js/spec/tabs/edit.js
lms/static/js/spec/calculator_spec.js
lms/static/js/spec/courseware_spec.js
lms/static/js/spec/feedback_form_spec.js
lms/static/js/spec/helper.js
lms/static/js/spec/histogram_spec.js
lms/static/js/spec/modules/tab_spec.js
lms/static/js/spec/requirejs_spec.js
xmodule/js/spec/annotatable/display_spec.js
xmodule/js/spec/capa/display_spec.js
xmodule/js/spec/html/edit_spec.js
xmodule/js/spec/problem/edit_spec_hint.js
xmodule/js/spec/problem/edit_spec.js
xmodule/js/spec/tabs/edit.js


!**/.eslintrc.js
8 changes: 4 additions & 4 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# Core
common/djangoapps/student/
common/djangoapps/third_party_auth/
common/lib/xmodule/xmodule/
lms/djangoapps/course_api/blocks
lms/djangoapps/courseware/
lms/djangoapps/grades/
Expand All @@ -16,13 +15,14 @@ openedx/core/djangoapps/oauth_dispatch
openedx/core/djangoapps/user_api/
openedx/core/djangoapps/user_authn/
openedx/features/course_experience/
xmodule/

# Core Extensions
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/html_module.py
common/lib/xmodule/xmodule/video_module
lms/djangoapps/discussion/
lms/djangoapps/edxnotes
xmodule/capa_module.py
xmodule/html_module.py
xmodule/video_module

# Analytics
common/djangoapps/track/ @edx/edx-data-engineering
Expand Down
76 changes: 0 additions & 76 deletions common/lib/xmodule/setup.py

This file was deleted.

45 changes: 0 additions & 45 deletions common/lib/xmodule/test_files/formularesponse_with_hint.xml

This file was deleted.

25 changes: 0 additions & 25 deletions common/lib/xmodule/test_files/stringresponse_with_hint.xml

This file was deleted.

26 changes: 0 additions & 26 deletions common/lib/xmodule/test_files/symbolicresponse.xml

This file was deleted.

2 changes: 1 addition & 1 deletion common/static/css/tinymce-studio-content.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
padding: 10px;
background-color: #fff;
/* keep font-family in sync with CUSTOM_FONTS constant in Html editor XModule
* (edx-platform/common/lib/xmodule/xmodule/js/src/html/edit.js)
* (edx-platform/xmodule/js/src/html/edit.js)
* and with acceptance tests in cms/djangoapps/contentstore/features/html-editor.feature
*/
font-family: 'Open Sans', Verdana, Arial, Helvetica, sans-serif;
Expand Down
4 changes: 2 additions & 2 deletions docs/guides/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
sys.path.append(root / "common/lib/capa")
sys.path.append(root / "common/lib/safe_lxml")
sys.path.append(root / "common/lib/symmath")
sys.path.append(root / "common/lib/xmodule")
sys.path.append(root / "lms/djangoapps")
sys.path.append(root / "lms/envs")
sys.path.append(root / "openedx/core/djangoapps")
sys.path.append(root / "openedx/features")
sys.path.append(root / "xmodule")

# Use a settings module that allows all LMS and Studio code to be imported
# without errors. If running sphinx-apidoc, we already set a different
Expand Down Expand Up @@ -236,9 +236,9 @@
'common/lib/capa/capa': 'common/lib/capa',
'common/lib/safe_lxml/safe_lxml': 'common/lib/safe_lxml',
'common/lib/symmath/symmath': 'common/lib/symmath',
'common/lib/xmodule/xmodule': 'common/lib/xmodule',
'lms': 'lms',
'openedx': 'openedx',
'xmodule': 'xmodule',
}

# These Django apps under cms don't import correctly with the "cms.djangapps" prefix
Expand Down
2 changes: 1 addition & 1 deletion docs/guides/testing/testing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Test Locations
located in ``common/lib/capa/capa/tests``.

- Javascript unit tests: Located in ``spec`` folders. For example,
``common/lib/xmodule/xmodule/js/spec`` and
``xmodule/js/spec`` and
``{cms,lms}/static/js/spec`` For consistency, you should use the
same directory structure for implementation and test. For example,
the test for ``src/views/module.js`` should be written in
Expand Down
2 changes: 1 addition & 1 deletion lms/djangoapps/courseware/tests/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class BaseTestXmodule(ModuleStoreTestCase):
USER_COUNT = 2
COURSE_DATA = {}

# Data from YAML common/lib/xmodule/xmodule/templates/NAME/default.yaml
# Data from YAML xmodule/templates/NAME/default.yaml
CATEGORY = "vertical"
DATA = ''
# METADATA must be overwritten for every instance that uses it. Otherwise,
Expand Down
4 changes: 2 additions & 2 deletions lms/djangoapps/courseware/tests/test_video_xml.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
These test data read from xml, not from mongo.

We have a ModuleStoreTestCase class defined in
common/lib/xmodule/xmodule/modulestore/tests/django_utils.py.
xmodule/modulestore/tests/django_utils.py.
You can search for usages of this in the cms and lms tests for examples.
You use this so that it will do things like point the modulestore
setting to mongo, flush the contentstore before and after, load the
templates, etc.
You can then use the CourseFactory and XModuleItemFactory as defined in
common/lib/xmodule/xmodule/modulestore/tests/factories.py to create the
xmodule/modulestore/tests/factories.py to create the
course, section, subsection, unit, etc.
"""

Expand Down
Loading