Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,200 Commits 1 Branch 0 Tags
869d09220c19ee1dfd11fd58a33cacda53de9798
Commit Graph

161 Commits

Author SHA1 Message Date
ichuang
493d8d26e5 add sample tabs to test_import_course 2013-08-27 20:04:55 -04:00
Calen Pennington
407b02b358 Centralize startup code, and execute in all contexts 
Inspired by: http://eldarion.com/blog/2013/02/14/entry-point-hook-django-projects/
Moves startup code to lms.startup and cms.startup, and calls the startup
methods in wsgi.py and manage.py for both projects.
 2013-08-27 12:12:20 -04:00
chrisndodge
0191ae9417 Merge pull request #652 from edx/feature/ichuang/import-with-no-static 
Enable mongodb to be used as back-end for git-based authoring workflow
 2013-08-22 11:05:02 -07:00
chrisndodge
2699ba65ba Merge pull request #756 from edx/fix/cdodge/incorrect-html-serialization 
Fix/cdodge/incorrect html serialization
 2013-08-22 08:58:56 -07:00
Chris Dodge
842556d284 add new test data with draft content 2013-08-22 08:57:10 -04:00
Peter Fogg
e177270d0d Merge pull request #700 from edx/peter-fogg/course-image-upload 
WIP: Peter fogg/course image upload
 2013-08-21 11:17:12 -07:00
Peter Fogg
e4302e62d2 Allow course image uploads in the settings page. 
Authors can upload an image (or choose an existing one) from the
settings page, using the in-context uploader from PDF
textbooks. Includes tests for backwards compatibility with XML courses
-- they used a magic filename (images/course_image.jpg) which is
mapped to a location in the Mongo contentstore.

Still needs some UX work, though the backend plumbing is there.
 2013-08-21 09:42:00 -04:00
ichuang
9b26e5bc78 dummy commit - trigger jenkins rebuild 2013-08-21 07:14:16 -04:00
ichuang
d2e93f7f7b remove unncessary images from new test course 2013-08-20 23:46:15 -04:00
ichuang
0d938d3940 Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static 
Conflicts:
	lms/djangoapps/courseware/tests/test_module_render.py
 2013-08-20 23:40:09 -04:00
ichuang
95952bd693 add tests of static_asset_path and importing with no static; 
fix (again) static_replace to work with static_asset_path
 2013-08-20 23:30:26 -04:00
Chris Dodge
d523167bdd add another piece of test data. just an img tag. 2013-08-20 23:16:39 -04:00
Chris Dodge
cf7b744fec add test files 2013-08-20 22:47:22 -04:00
Chris Dodge
5a7bcd7bb3 always serialize out HTML content to a separate .html file 2013-08-20 22:43:53 -04:00
Chris Dodge
5989bf6bdc update the PDF textbook url paths as well as update wiki_slug when importing 2013-08-20 21:50:28 -04:00
Chris Dodge
033f922ec0 add a try catch around the staticstorage lookup, which can throw an exception 2013-08-17 10:33:59 -04:00
Don Mitchell
e4a69373d0 xblock fields persist w/o breaking by scope 
Letting xblocks handle scope rather than separating fields into
different attrs. Although, split still shunts content fields to a
different collection than setting and children fields.

The big difference is that content fields will always be a dict and not
sometimes just a string and there's no special casing of 'data' attr.

The other mind change is no more 'metadata' dict.
 2013-08-16 10:42:52 -04:00
Peter Fogg
e20acee4c4 Working on Videoalpha test fix. 
Fixed all common and LMS tests.

The tests were failing because XMLDescriptor adds in some attributes
to _model_data, such as `xml_attributes`, that aren't necessary. The
solution is to handle all XML parsing in VideoDescriptor. There's
still one test failing in CMS, which has to do with metadata being
saved. I'm still working out how to update it in such a way that it
doesn't fail, but still tests something meaningful.
 2013-08-12 14:32:15 +03:00
Chris Dodge
1c2958e35d address PR feedback 2013-08-09 20:46:14 -04:00
Chris Dodge
607573fbd9 add test files 2013-08-09 20:46:13 -04:00
Chris Dodge
e2358af6a9 add ability to rewrite links on the old /courses/<org>/<course>/<run>/jump_to/i4x://<org>/<course> .. intracourseware linking to the new portable /jump_to_id/<id> format 2013-08-09 20:46:13 -04:00
Chris Dodge
36fda35040 do portable link rewriting on import and add test to confirm it 2013-08-09 20:46:12 -04:00
Chris Dodge
3dbe4c189f add unit tests around asserting that /static/ links are not re-written on import 2013-08-05 16:15:03 -04:00
Chris Dodge
ebbeeb16a2 add some unit tests for the new fields 2013-08-02 09:56:19 -04:00
Chris Dodge
6f3b49a6f9 add some chinese characters to the test content 2013-07-23 12:15:56 -04:00
Chris Dodge
e24eb3e4eb added explicit unit test to verify the link rewriting 2013-07-23 12:15:55 -04:00
Chris Dodge
80e0b99342 add a reference in the toy course to the test jump_to_id HTML module 2013-07-23 12:11:41 -04:00
Chris Dodge
1c79b9c874 add a /jump_to_id/ shortcut for producing more durable links between courseware in Studio 2013-07-23 12:10:49 -04:00
chrisndodge
8c94be8083 Merge pull request #436 from edx/fix/cdodge/stop-using-unmunged-urlnames-as-display-names 
change from_xml class method on video class to make sure we honor the fa...
 2013-07-23 08:33:27 -07:00
Chris Dodge
22802a4d29 change from_xml class method on video class to make sure we honor the fact that the xml string could actually be a pointer to another file on disk which actually contains the attributes 2013-07-19 13:54:22 -04:00
Don Mitchell
df7b917b40 Implement next generation modulestore 
A new modulestore backed by mongo that changes the data format to
facilitate easy versioning, sharing content between courses, and fast
lookup of course structure and Scope.settings data.

Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
 2013-07-19 13:10:14 -04:00
Vik Paruchuri
915f815c63 Merge remote-tracking branch 'origin/master' into fix/vik/studio-oe 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
 2013-07-18 11:55:37 -04:00
Chris Dodge
99ff3719cc remove the video from the toy course for now as the import-export-import isn't totally equivalence. 2013-07-18 10:35:50 -04:00
Chris Dodge
8325e28a10 add a default XML serialization if the 'data' field is empty or None. Some XModules now - like video XModule - do not have XML set in the 'data' field 2013-07-17 12:31:33 -04:00
chrisndodge
8f743424ba Merge pull request #387 from edx/fix/cdodge/unescape-quote-strings 
[STUD-406] Fix/cdodge/unescape quote strings
 2013-07-12 15:32:55 -07:00
Chris Dodge
ab4012cc59 fix up some of the test courses which had hardcoded that quot; escaping 2013-07-12 11:33:46 -04:00
JonahStanley
8110307ba9 CMS now refactored to use world dictionary 2013-07-12 10:32:48 -04:00
JonahStanley
5d300bf36f Fixed the broken unit tests from deleting full 2013-07-11 14:34:41 -04:00
JonahStanley
4e015eacf5 Fixed the whitelist test to not use full course 2013-07-11 12:05:18 -04:00
Vik Paruchuri
d710d8e43a Merge remote-tracking branch 'origin/master' into fix/vik/studio-oe 2013-07-11 10:52:50 -04:00
JonahStanley
67326cfae8 Fixed xmodule tests to not rely on full 
Also fixed things in the toy course where needed
 2013-07-11 10:12:09 -04:00
JonahStanley
982777f547 All cms unit test no longer rely on the full course. 
Factories were used when possible but tests depending on importing or things not manageable by factories used the toy course.  New files were added to include the needed functionality.  Most files are blank or have minimal xml needed to work
 2013-07-11 10:09:05 -04:00
JonahStanley
55e6d1ad67 Asset tests do not rely on the full course 
A blank asset file was also added to toy
 2013-07-11 10:08:47 -04:00
JonahStanley
62f2764728 First half of refactorization. 
This fixes the following tests(T stands for toy, F stands for factory made):
T import_textbook_as_content_element (needed to add a textbook to toy)
F static_tab_reordering
T import polls (needed to add a poll to toy)
T xlint_fails
F delete
T about_overrides (needed to add an about override to toy)
F remove_hide_progress_tab
 2013-07-11 10:08:40 -04:00
JonahStanley
456daa9ce5 Deleted Files and annotated tests 2013-07-11 10:07:02 -04:00
David Baumgold
2a92a14054 Wrote simple lettuce tests for pdf textbooks 2013-07-09 19:16:09 -04:00
Vik Paruchuri
8a6c8b5ab0 Add test for incrementing student attempts 2013-06-28 14:10:17 -04:00
Don Mitchell
d9575a0874 Remove traling commas to make json valid 2013-06-25 22:34:36 -04:00
JonahStanley
ec4547b51e Merge branch 'master' into jonahstanley/add-courseteam-tests 2013-06-20 16:55:37 -04:00
JonahStanley
70d48e2e9f Now referencing css element 2013-06-20 16:40:13 -04:00