Commit Graph

296 Commits

Author SHA1 Message Date
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
JonahStanley
b9d79aea60 A bunch of pylint fixes and explicit use case for uploads/test 2013-06-20 15:55:53 -04:00
JonahStanley
46da897610 Merge branch 'master' into jonahstanley/add-courseteam-tests
Conflicts:
	cms/envs/test.py
2013-06-17 16:43:56 -04:00
Peter Fogg
8159e86141 Many changes to finish up PR. To wit:
-- Changed docstrings to use double quote.
-- More consistent naming for youtube IDs (normal_speed_id -> youtube_id_1_0).
-- Formatting changes for readability.
-- Updated test XML to expect JSON-encoded strings; prevents tests from spuriously failing.
2013-06-17 13:46:20 -04:00
Peter Fogg
d8f307a50b Merge branch 'master' into peter-fogg/remove-video-xml 2013-06-14 15:33:51 -04:00
Peter Fogg
206f582503 Fix merge conflict in common/test/data/full/sequential/Administrivia_and_Circuit_Elements.xml. 2013-06-14 10:44:05 -04:00
Peter Fogg
5cee351896 Update XML in old video tests. This change tags like <video youtube="1.0:abcdefg"> to <video youtube_id_1_0="abcdefg". 2013-06-13 11:51:04 -04:00
JonahStanley
40bf2514ab Added tests for downloading files
A few notes:
1. Downloads are done through direct requests.  This is due to the difficulty of downloading a file to the correct place
2. Modifiying a file will just change the file to a random 10 character string.
3. The page is reloaded in between uploads.  This is due to a current caching bug that is in the process of being looked into and will be updated once it is fixed.
2013-06-13 11:00:45 -04:00
cahrens
fae8fd3841 Merge branch 'master' into feature/christina/unify-fields
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/fields.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/test_fields.py
	requirements/edx/github.txt
2013-06-13 10:55:13 -04:00
Peter Fogg
f9b825fe8b Fix failing acceptance tests and allow videos to be imported from XML. 2013-06-11 09:27:02 -04:00
Don Mitchell
d7194e6bec struct_time to datetime conversion. 2013-06-10 17:16:34 -04:00
cahrens
1273bc22b3 Additional test coverage. 2013-06-07 17:24:07 -04:00