Jean Manuel Nater
72b4561e3a
Moved xml_store_config, mongo_store_config, and draft_mongo_store_config to xmodule/modulestore/tests/django_util.py
...
Removed some repeated instances of xml_store_config.
Reverted some changes to mongo_store_config so each modulestore gets it's own uuid.
2013-07-01 14:45:53 -04:00
Jean Manuel Nater
9bfddd4891
Addressed pull request feedback.
2013-06-21 14:05:57 -04:00
Jean Manuel Nater
905d884aa7
Removed a unnecessary imports from mongo_login_helpers.py and repeated code from tests.py.
2013-06-18 15:41:53 -04:00
Jean Manuel Nater
97275a3286
Refactored some of the classes in tests.py to not unnecessarily depend on the XML modulestore.
...
Conflicts:
lms/djangoapps/courseware/tests/test_navigation.py
lms/djangoapps/courseware/tests/test_view_authentication.py
lms/djangoapps/courseware/tests/tests.py
2013-06-18 13:54:16 -04:00
Jean Manuel Nater
78128e7672
Merge branch 'master' into jnater/playground
...
Conflicts:
common/lib/xmodule/xmodule/modulestore/tests/factories.py
lms/djangoapps/courseware/tests/tests.py
2013-06-18 13:36:24 -04:00
Jean Manuel Nater
07486a4dbc
Refactoring the code in tests.py to remove unnecessary dependencies on the XML Modulestore.
2013-06-17 11:54:16 -04:00
Jean Manuel Nater
a25a0d71ac
refactored tests in courseware to draw course info from mongo instead of xmlmodulestore
2013-06-12 10:42:52 -04:00
Don Mitchell
168cb306d3
Move tz_aware into connection config rather than settings.
...
Make django use_tz
2013-06-10 17:16:35 -04:00
Don Mitchell
28f8910db4
Make pymongo tz_aware
2013-06-10 17:16:34 -04:00
Don Mitchell
d7194e6bec
struct_time to datetime conversion.
2013-06-10 17:16:34 -04:00
Greg Price
de5b4d7d27
Merge branch 'master' into drupal-new
2013-05-17 16:10:56 -04:00
Diana Huang
1c2175304e
Merge branch 'master' into drupal-new
2013-05-16 16:27:36 -04:00
Ned Batchelder
e947218285
Merge master to here.
2013-05-16 14:21:51 -04:00
Chris Dodge
6cec66979a
fix broken tests. Also drive by fix for the sporadic failure on tests which may go to a textbook page. The URL formatting was incorrect in the test
2013-05-15 11:16:47 -04:00
Greg Price
a0fb4d6c85
Merge branch 'master' into drupal-new
...
Conflicts:
lms/envs/aws.py
lms/envs/common.py
lms/static/sass/base/_base.scss
lms/templates/forgot_password_modal.html
2013-05-10 10:30:10 -04:00
Chris Dodge
1b0eff52ed
create test cases to simulate error exporting/importing textbooks
2013-05-10 10:01:10 -04:00
Ned Batchelder
ceb6cedaae
Fix merge
2013-05-06 11:39:19 -04:00
Ned Batchelder
249ba4be33
Finish the test for computed_answer
2013-05-06 10:55:04 -04:00
Ned Batchelder
a6677aa0a8
Computed answers are run through safe_exec.
2013-05-06 10:55:04 -04:00
Ned Batchelder
6297d64528
Now these can be in the same test class
2013-05-06 10:55:04 -04:00
Ned Batchelder
ff1df569cb
Refactor submitting problems so we don't need custom code for each test.
2013-05-06 10:55:04 -04:00
Ned Batchelder
33abe54e0d
Work in progress to sandbox the uses of eval in LMS.
2013-05-06 10:55:03 -04:00
Ned Batchelder
9249bafd00
Add a test of a bad answer also.
2013-05-06 10:55:03 -04:00
Ned Batchelder
e69a073161
Add a test for the Python in schemaresponse, and refactor the tests while I was in there.
2013-05-06 10:55:03 -04:00
Ned Batchelder
9827a0e218
Oops, this line can go too.
2013-05-06 10:55:03 -04:00
Ned Batchelder
9cc43f1d9b
Simplify this test setup.
2013-05-06 10:55:03 -04:00
Jay Zoldak
8ef88fa5b0
Fix tests that randomly fail when run in concurrent jobs on jenkins.
2013-05-06 10:24:38 -04:00
Greg Price
e5846e64bd
Modify course registration flow for new login and registration pages
...
Now that we are using separate pages for login and registration rather than
modals, clicking the registration button for a course should direct an
unauthenticated user to the registration page, and the user should be enrolled
in the course upon successful registration. Likewise, an unauthenticated user
attempting to unenroll from a course should be directed to the login page and
subsequently unenrolled from the course upon successful login. The enrollment
change service also now uses HTTP status codes rather than JSON to communicate
status to the front end.
2013-05-03 10:01:11 -04:00
Calen Pennington
6644b78819
Fix gradebook when using grade cutoffs other than A/B/C
2013-04-16 11:38:58 -04:00
Jay Zoldak
d044d5c48d
a few more pep8 fixes
2013-03-29 13:15:33 -04:00
Jay Zoldak
b63aae221e
small pep8 pylint and superclass fixes
2013-03-29 10:41:27 -04:00
Will Daly
5bf839c9a9
Guard against trying to load a template when checking pages.
2013-03-28 16:55:20 -04:00
Will Daly
f652fb5f73
Pylint and pep8 fixes
2013-03-28 12:51:09 -04:00
Will Daly
13c01ec3fc
Randomized instructor page tests
2013-03-28 10:03:05 -04:00
Will Daly
bf37d4a9a3
Randomized loading of test pages for dark launch test
2013-03-28 09:33:51 -04:00
Will Daly
3eefb7d5ec
Resolved conflicts from rebase to master; fixed keyword error caught by
...
pylint
2013-03-28 08:58:56 -04:00
Will Daly
27a31230bf
Removed full course tests
2013-03-28 08:55:45 -04:00
Will Daly
7978c581db
Changed test for checking all pages to checking a random page
2013-03-28 08:55:16 -04:00
Brian Wilson
99778b1b5b
add fixes for 500 bugs (lighthouse 287 and 293) by requiring login for accessing licenses and inline discussions. Add unit tests for licenses, and rearrange tests based off of (the former) PageLoad. Also cleanups for pylint and pep8.
2013-03-27 17:59:56 -04:00
Calen Pennington
cec3475c9d
Remove references to .definition and .metadata in modules
2013-03-06 18:07:56 -05:00
Calen Pennington
8a9ba79d1f
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
cms/djangoapps/contentstore/views.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
2013-03-06 12:15:07 -05:00
Jay Zoldak
b0a018195a
Pep8 fixes for tests
2013-03-05 11:53:00 -05:00
Calen Pennington
bd822b9d2f
Fix tests post-merge
2013-02-13 14:13:22 -05:00
Calen Pennington
793bbfd351
Set up dev environment for testing xml vs mongo vs split_mongo modulestores
2013-02-13 14:04:21 -05:00
Ned Batchelder
aa2d0ecaf2
We no longer need override_settings, Django has a better one.
2013-02-11 17:06:35 -05:00
Calen Pennington
4f555f6480
Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model
...
Conflicts:
cms/djangoapps/contentstore/course_info_model.py
cms/djangoapps/contentstore/module_info_model.py
cms/djangoapps/contentstore/tests/factories.py
cms/djangoapps/contentstore/tests/test_course_settings.py
cms/djangoapps/contentstore/views.py
cms/djangoapps/models/settings/course_details.py
cms/djangoapps/models/settings/course_grading.py
cms/templates/edit_subsection.html
common/djangoapps/mitxmako/shortcuts.py
common/djangoapps/static_replace.py
common/djangoapps/util/converters.py
common/djangoapps/xmodule_modifiers.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/abtest_module.py
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/discussion_module.py
common/lib/xmodule/xmodule/error_module.py
common/lib/xmodule/xmodule/html_module.py
common/lib/xmodule/xmodule/js/src/video/display.coffee
common/lib/xmodule/xmodule/mako_module.py
common/lib/xmodule/xmodule/modulestore/mongo.py
common/lib/xmodule/xmodule/modulestore/store_utilities.py
common/lib/xmodule/xmodule/modulestore/xml.py
common/lib/xmodule/xmodule/modulestore/xml_importer.py
common/lib/xmodule/xmodule/raw_module.py
common/lib/xmodule/xmodule/self_assessment_module.py
common/lib/xmodule/xmodule/seq_module.py
common/lib/xmodule/xmodule/template_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_export.py
common/lib/xmodule/xmodule/tests/test_import.py
common/lib/xmodule/xmodule/video_module.py
common/lib/xmodule/xmodule/x_module.py
common/lib/xmodule/xmodule/xml_module.py
lms/djangoapps/courseware/access.py
lms/djangoapps/courseware/courses.py
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/models.py
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/tests/tests.py
lms/djangoapps/courseware/views.py
lms/djangoapps/django_comment_client/utils.py
lms/templates/staff_problem_info.html
lms/templates/video.html
rakefile
2013-02-07 15:12:30 -05:00
Calen Pennington
cfae1cdf62
Pep8 autofixes
2013-02-06 11:13:50 -05:00
Chris Dodge
dbf15fc2ac
add comment on draft store test which explains test success is just for get_items() not to throw an exception when passed in a course_id
2013-01-30 09:46:38 -05:00
Calen Pennington
993c24b72b
WIP: Model data caching work
2013-01-23 14:51:07 -05:00
Chris Dodge
54ee1607b8
add unit test to test DraftModuleStore.get_items() fix
2013-01-23 11:22:37 -05:00
