Commit Graph

858 Commits

Author SHA1 Message Date
Jay Zoldak
64e8f9c0cd Add BDD lettuce tests for studio overview toggle section feature. 2013-01-10 16:00:40 -05:00
Calen Pennington
89a0b82e5c Decrease the number of queries needed for LMS courseware
This cuts the number of queries in 6.002 courseware loads from ~650 to
~5-40. Still to do: cache CustomTag templates so that we only load them
once per request.
2013-01-10 13:55:46 -05:00
chrisndodge
ee9b9d0422 Merge pull request #1249 from MITx/feature/cas/speed-editor
Feature/cas/speed editor
2013-01-09 17:52:46 -08:00
Don Mitchell
fff9afdeb8 Minor cleanups 2013-01-09 11:38:01 -05:00
Don Mitchell
b8f530e865 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-09 10:49:20 -05:00
Don Mitchell
2d8ddb0dcb Ever slightly more rigorous test. actually look for the markdown field
in the model as well as the ancillary info
2013-01-09 10:47:03 -05:00
Don Mitchell
62a70170cf Updated unit test for the create operation related to bug 107 2013-01-09 09:55:50 -05:00
Don Mitchell
2019c9d037 Bug 107 2013-01-09 09:47:43 -05:00
cahrens
d53669fcb9 Merge branch 'feature/cale/cms-master' into feature/cas/speed-editor 2013-01-09 09:41:35 -05:00
Don Mitchell
21f5c2d89a Merge pull request #1240 from MITx/feature/zoldak/cms-bdd-testing
Set up the framework for running lettuce tests against studio
2013-01-09 06:30:03 -08:00
Don Mitchell
83b7997d12 Added unit tests and generalized a catch 2013-01-08 16:43:42 -05:00
Don Mitchell
1708dc4080 Use html rather than xml parsing for course updates 2013-01-08 15:13:37 -05:00
Jay Zoldak
f056f0624d Set up the framework for running lettuce tests against studio 2013-01-08 14:44:45 -05:00
Don Mitchell
ae4e7815a9 CapaDescriptor new unit tests 2013-01-08 13:16:38 -05:00
Don Mitchell
6e2b4a07d8 Added is_empty to model presented to unit.html 2013-01-08 11:18:57 -05:00
Chris Dodge
c7d81cc425 be sure to return an instance of the class 2013-01-07 16:28:30 -05:00
Don Mitchell
12abdbce73 Added 'has_markdown' property to templates in unit.html so that we can
differentiate them in the drop down (just added MD to names for
now--brian's doing the official differentiation)
2013-01-07 10:55:10 -05:00
Calen Pennington
789ac3fc87 Use the XBlock library as the base for XModule, so that we can incrementally rely on more and more of the XBlock api 2013-01-04 16:19:58 -05:00
Calen Pennington
7f39dd974b Minor whitespace cleanup 2013-01-02 15:07:56 -05:00
Calen Pennington
4bec871b0f Don't return BadRequest classes, return instances 2013-01-02 15:07:12 -05:00
Calen Pennington
8e0d218c7d Stop using .definition and .metadata directly 2013-01-02 15:06:43 -05:00
Chris Dodge
b5ccb4b8fc trigger another build 2013-01-02 15:01:21 -05:00
Chris Dodge
d008cb9f3c another comment commit just to trigger a new build 2013-01-02 14:25:35 -05:00
Calen Pennington
60fa8619cb Fixing tests 2013-01-02 10:37:49 -05:00
Calen Pennington
6427dd6742 WIP: Get the cms running. Component previews work 2013-01-02 09:07:02 -05:00
Calen Pennington
fa75245e8a WIP: Start cleaning up CMS to work with new field format 2013-01-02 09:05:48 -05:00
Chris Dodge
cf3df23094 basically force another build by adding a comment 2012-12-28 16:48:02 -05:00
Calen Pennington
84cb0ce99b Move inheritance logic out into a separate file in the modulestore 2012-12-28 14:56:42 -05:00
Calen Pennington
8991cdd3b5 Stop raising BaseExceptions 2012-12-28 14:51:50 -05:00
Calen Pennington
cbfc7b201a WIP more changes to model definitions. Next Up: actually wiring model data into the rdbms 2012-12-28 14:44:31 -05:00
Calen Pennington
8ba4163557 WIP. Data loads, but not all of it 2012-12-28 14:39:13 -05:00
Chris Dodge
f343052711 add a comment. Namely we just want to trigger another build. 2012-12-28 14:26:52 -05:00
Chris Dodge
6d20292ae8 add unit test to make sure rewriting is occuring when querying the handouts 2012-12-28 12:21:14 -05:00
Chris Dodge
7a4d89b1ad add in static asset link rewriting to the Course Handout section 2012-12-28 11:34:45 -05:00
Chris Dodge
507a1dc073 remove unused white space and imports 2012-12-27 16:33:10 -05:00
Chris Dodge
239b118abe add service entry point to generate tar.gz file and return to caller. Use of the NamedTemporaryFile will auto cleanup. 2012-12-27 15:31:12 -05:00
Chris Dodge
8e5fc2917a Merge branch 'feature/btalbot/cms-export' into feature/cdodge/export 2012-12-27 14:43:36 -05:00
Chris Dodge
3fa425c5d0 add unit test for import->export->import simple flow 2012-12-27 14:40:38 -05:00
Chris Dodge
625237601f Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/export
Conflicts:
	common/lib/xmodule/xmodule/contentstore/content.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
2012-12-27 14:16:40 -05:00
Don Mitchell
53b73ca3da Merge pull request #1208 from MITx/feature/cdodge/clone-course
fix up some thumbnail issues. Also we need to manage the user permission...
2012-12-27 09:26:51 -08:00
Chris Dodge
6951865229 add unit tests for course cloning and deleting 2012-12-27 12:20:45 -05:00
Chris Dodge
9dff39dd6d start adding clone unit test 2012-12-27 11:25:04 -05:00
Don Mitchell
da343fd1d7 Finally! Details unit tests work and pass. Grading ones are fairly far
along.
2012-12-27 11:22:15 -05:00
Chris Dodge
fe408be1cc message edit 2012-12-27 10:32:07 -05:00
Chris Dodge
7088821233 fix command error message. There are really only two arguments supported (the optional 6 had been removed, but I forgot to change the message 2012-12-27 10:30:26 -05:00
Chris Dodge
28d9827468 fix up some thumbnail issues. Also we need to manage the user permissions when we clone and delete course 2012-12-27 10:20:28 -05:00
Don Mitchell
83bc9d7bf8 Grader unit tests (partial) 2012-12-26 15:48:37 -05:00
Don Mitchell
a35c1386f2 Bug 99: don't show date as 'Unset' but leave out altogether if not set
plus commented out failing unit tests until I can get someone to help
debug them.
2012-12-26 11:30:31 -05:00
Don Mitchell
58abb10c2d Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12 2012-12-26 10:31:10 -05:00
Don Mitchell
ff490599fa Debugging unit tests 2012-12-26 10:29:35 -05:00