Calen Pennington
531eb80eb2
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/contentstore/views.py
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
lms/djangoapps/open_ended_grading/tests.py
2013-03-13 12:18:04 -04:00
Victor Shnayder
b06615298f
Add logging to debug strange cohort behavior on prod.
...
Strange behavior:
- There are 20 cohorts that users should be randomly assigned
into in HeroesX
- Almost all, but not all (e.g. ~3300 / 3400) users end up in the
same group.
- testing manually locally and on prod in a django shell shows
nothing wrong
2013-03-11 15:24:14 -07:00
Calen Pennington
1bfb933518
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/contentstore/views.py
cms/templates/edit_subsection.html
cms/templates/overview.html
cms/templates/unit.html
cms/templates/widgets/header.html
common/djangoapps/course_groups/tests/tests.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/js/src/.gitignore
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_exporter.py
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
common/lib/xmodule/xmodule/x_module.py
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/models.py
lms/djangoapps/courseware/views.py
lms/djangoapps/open_ended_grading/tests.py
2013-03-04 16:33:40 -05:00
Victor Shnayder
01a38c29be
Add auto-cohorting functionality.
...
See changes in xml-format.md or wiki (dynamic cohorts v1) for spec.
2013-02-24 18:48:01 -05:00
Calen Pennington
f0f7e0dc1c
Fix more tests
2013-02-13 14:22:08 -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
cfae1cdf62
Pep8 autofixes
2013-02-06 11:13:50 -05:00
Victor Shnayder
734a8bd6e5
make tests pass with cms config as well as lms
2013-01-28 15:07:44 -05:00
Victor Shnayder
46570b01ef
refactor tests, add test for is_commentable_cohorted, fix a bug
2013-01-26 13:49:12 -05:00
Victor Shnayder
439acf2df7
Fix docstring and test for get_cohort
...
Returns None if course isn't cohorted, even if cohorts exist. Shouldn't happen on prod, but could if cohorting is turned off mid-course.
2013-01-26 13:06:09 -05:00
Victor Shnayder
87e92644b6
Make all tests pass
...
caveat: with a bit of hackery. Need to do better testing once things are live.
2013-01-25 16:13:55 -05:00
Victor Shnayder
22ccf9c500
Some test cleanups
2013-01-24 17:33:25 -05:00
Victor Shnayder
3488083e6b
Add a get_course_cohorts function and test
2013-01-24 15:12:52 -05:00
Victor Shnayder
1b9a3557eb
get_cohort() function and test
2013-01-24 15:12:52 -05:00
