Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
66,833 Commits 1 Branch 0 Tags
ecdf774e75dbb0f0fe84494de18dfdf946c14552
Commit Graph

4617 Commits

Author SHA1 Message Date
Will Daly
c660229b25 Added checking for problem answer state after a problem is checked 2013-03-25 16:37:59 -04:00
Victor Shnayder
f0e1b477f7 Merge pull request #1703 from MITx/feature/diana/matlab-input 
Matlab Input Type
 2013-03-25 08:27:56 -07:00
Chris Dodge
fd973442b1 if we have to reload a module and already have the descriptor, we don't need to refect the descriptor (which results in another DB round-trip. We just need the student state. 2013-03-22 13:57:53 -04:00
Arthur Barrett
7120998938 refactoring notes js 2013-03-21 17:18:45 -04:00
Will Daly
6728f16ae4 Merge branch 'feature/zoldak/refactor-factories' into feature/will/speed_up_lettuce_tests 
Conflicts:
	lms/djangoapps/courseware/features/problems.py
 2013-03-21 10:49:04 -04:00
Will Daly
2fc96d5fb7 Fixed a merge issue about code response 2013-03-20 17:18:26 -04:00
Will Daly
7a282a9c54 Edited comments, ran pep8 2013-03-20 17:08:19 -04:00
Will Daly
911308cba2 Changed check for unanswered problems so that it now looks for 
an "unanswered" div or span.  This is much faster than
asserting that correct/incorrect is NOT present.
 2013-03-20 17:08:19 -04:00
Will Daly
f69778b367 Changed lettuce test log_in step to log in programatically 
rather than using the login dialog.
 2013-03-20 17:08:19 -04:00
Diana Huang
af1af8c6d1 Address code review feedback: 
- improve docstrings
- only pass in the state for a particular input and
not the whole dictionary
- refactor some common code
- minor syntax cleanup
 2013-03-20 14:14:54 -04:00
David Ormsbee
f133d3181b Merge pull request #1706 from MITx/fix/cale/simple-lazy-object 
Force instantiation of the user before querying
 2013-03-20 11:08:57 -07:00
Jay Zoldak
23364d8b0f Merge branch 'master' into feature/zoldak/refactor-factories 2013-03-20 13:36:01 -04:00
Calen Pennington
154a441033 Only use .pk for queries, and not on inserts 2013-03-20 13:24:25 -04:00
Calen Pennington
cbed66280a Fix pep8 and pylint errors 2013-03-20 13:20:28 -04:00
Calen Pennington
36443163f6 Force instantiation of the user before querying 
Without accessing .pk, it's possible for the user object to still be a
SimpleLazyObject, which breaks Django's query engine

http://stackoverflow.com/questions/11875737/django-filtering-drafts-by-user-causes-error
 2013-03-20 12:59:34 -04:00
Jay Zoldak
6048bc2832 Pep8 fixes for factory refactor 2013-03-20 11:31:12 -04:00
Will Daly
5411fc765e Refactored lettuce test of capa problems to use 
world.css_click() helper instead of directly
calling splinter.
 2013-03-20 11:27:28 -04:00
Will Daly
2867476115 Added __init__.py and test_mock_xqueue_server.py, 
which should have been included in the last commit
 2013-03-20 11:18:41 -04:00
Will Daly
8f055ab037 Moved mock_xqueue_server to its own subpackage within 
lms/djangoapps/courseware/
Separated tests of the mock server into test_mock_xqueue_server.py
 2013-03-20 11:14:42 -04:00
Jay Zoldak
16773aac63 More factory refactoring. 2013-03-20 09:38:53 -04:00
Jay Zoldak
3576a3154b Repoint factory references in lettuce tests to world. 2013-03-20 09:38:52 -04:00
Diana Huang
eda6169b8b Pass along a url creator as opposed to just a url through 
the ModuleSystem.
 2013-03-20 09:23:25 -04:00
Will Daly
e7f8c7c676 pep8 fixes 2013-03-19 16:00:43 -04:00
Will Daly
39aa25c2d6 Removed file that was added accidentally. 2013-03-19 15:57:24 -04:00
Will Daly
66434d7d05 Moved XQueue mock from terrain into LMS, so that the 
server is not created for cms tests.
 2013-03-19 15:55:05 -04:00
Will Daly
20ccf5937b Implemented CodeResponse lettuce tests 2013-03-19 15:55:05 -04:00
Arthur Barrett
0710bbd70c Merge branch 'master' into feature/abarrett/lms-notes-app 2013-03-19 13:43:45 -04:00
Calen Pennington
0209c883bb Remove trailing whitespace 2013-03-19 10:41:38 -04:00
Will Daly
568f557dfc Pep8 fixes 
Changed constant to uppercase
 2013-03-18 13:57:26 -04:00
Will Daly
e41bb8462c Added lettuce tests for script (customresponse) problems. 
Increased wait time for login screen to reduce false positives.
 2013-03-15 14:04:22 -04:00
Will Daly
8423816076 LMS contentstore lettuce tests now dynamically create courses in mongo 
using terrain.factories.py and capa.tests.response_xml_factory
 2013-03-15 14:04:22 -04:00
Will Daly
a20a3a02bb Refactored lettuce problem test assertion that a problem is 
correct/incorrect/unanswered
 2013-03-15 14:02:21 -04:00
Will Daly
3d8625da9c Refactored problem lettuce test implementation 2013-03-15 14:02:21 -04:00
Will Daly
5a2a4055f8 Added lettuce test for formula problem 2013-03-15 14:02:21 -04:00
Will Daly
4d5a8e757c Added lettuce tests for numerical problem 2013-03-15 14:02:20 -04:00
Will Daly
b3946828c0 Added lettuce tests for string problems 2013-03-15 14:02:20 -04:00
Will Daly
56a6363d7a CSS selectors in lettuce tests for problems now include the element tag. 2013-03-15 14:02:20 -04:00
Will Daly
90213d483c Wrote lettuce tests for drop-down, multiple choice, and checkbox 
problems.
 2013-03-15 14:02:20 -04:00
Arthur Barrett
20767d5cc7 create notes djangoapp for annotator.js 2013-03-15 12:41:52 -04:00
Calen Pennington
6b64b4214f Make relative imports explicitly relative 2013-03-15 11:23:22 -04:00
Calen Pennington
131e3120b9 Try to make psychometrics work with new storage model code 2013-03-13 16:35:50 -04:00
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
Brian Wilson
47e708e713 fix pylint and pep8 warnings 2013-03-12 15:49:48 -04:00
Brian Wilson
6aed059d5f Change date and remove filtering by grade. Add check for student_answers. 2013-03-12 14:55:27 -04:00
Brian Wilson
fe0447093c add management command to regrade partial-credit problems affected by get_npoints bug. 2013-03-12 14:00:18 -04:00
Calen Pennington
2a96c45677 Make default value for format setting None, and force lms and cms to be explicit about a string default 2013-03-12 10:16:14 -04:00
Calen Pennington
2113541632 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	.ruby-version
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/models/settings/course_metadata.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
 2013-03-12 07:23:28 -04:00
David Ormsbee
0605c94113 Merge pull request #1636 from MITx/feature/brian/htmlbook 
Initial implementation of htmlbook.
 2013-03-11 11:38:46 -07:00
Calen Pennington
035829289e Parse weight as a float when reading from a string 2013-03-08 16:01:27 -05:00
Calen Pennington
93db5acc15 Make display_name defaulting explicit 2013-03-08 14:58:09 -05:00