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
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
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
Chris Dodge
b6090952da
randomize_module.py was missing 'import lxml' to support definition_to_xml(). Also, fix serialization of show_timezone to expect a bool
2013-05-23 14:24:36 -04:00
Ned Batchelder
e947218285
Merge master to here.
2013-05-16 14:21:51 -04:00
Chris Dodge
1b0eff52ed
create test cases to simulate error exporting/importing textbooks
2013-05-10 10:01:10 -04:00
Ned Batchelder
070f184ee0
Not sure why these had capital-I's in them, since the text just above shows lowercase-i's, and uppercase doesn't work properly.
2013-05-06 10:55:06 -04:00
Ned Batchelder
42eee48ec9
A few places we used an option of 'imaginaryi', which isn't a real option. Doesn't change any behavior.
2013-05-06 10:55:06 -04:00
Chris Dodge
9cd38d115e
import needs to enumerate through the fields for all content scopes. Also add unit test
2013-03-20 21:37:09 -04:00
Chris Dodge
ab9d30cbc6
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-static-tabs
2013-01-31 10:51:24 -05:00
Chris Dodge
fc57e7afdb
add testing for course info export. Plus DRY things out a bit
2013-01-31 10:51:20 -05:00
chrisndodge
676e80bd9d
Merge pull request #1389 from MITx/fix/cdodge/export-static-tabs
...
add new tab file
2013-01-30 12:26:12 -08:00
Chris Dodge
a9da761b18
add new tab file
2013-01-30 15:25:00 -05:00
Chris Dodge
855c8bb7e7
add unit test for tab reordering
2013-01-29 13:44:42 -05:00
Chris Dodge
9f73294959
add end_date.html file
2013-01-14 12:23:36 -05:00
Chris Dodge
edb913f6ac
add tests for about content overrides
2013-01-14 12:12:40 -05:00
Chris Dodge
e70db062b2
Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge
...
Conflicts:
requirements.txt
2013-01-03 10:46:24 -05:00
Chris Dodge
725805f1cf
add forgotten new file
2012-12-28 13:52:49 -05:00
Calen Pennington
c917725ff0
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
...
Conflicts:
common/lib/xmodule/xmodule/seq_module.py
common/lib/xmodule/xmodule/template_module.py
common/lib/xmodule/xmodule/x_module.py
lms/djangoapps/courseware/tests/tests.py
lms/djangoapps/courseware/views.py
lms/static/sass/course.scss
requirements.txt
2012-12-07 11:17:41 -05:00
Brian Wilson
dfb9913100
clean up lms tests, and fix export/import
2012-12-04 11:52:35 -05:00
Brian Wilson
4ebd70dcc4
add support for utf8 in sequences, verticals and custom modules.
2012-12-04 03:54:36 -05:00
Brian Wilson
5b02e1e3ce
add additional html tests
2012-12-03 16:26:08 -05:00
Brian Wilson
1d44ebb10c
Add more non-ascii characters to full dataset, and make fixes in xmodule code.
2012-12-03 16:22:25 -05:00
Calen Pennington
0fff578e7d
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
...
Conflicts:
.gitmodules
lms/envs/aws.py
lms/envs/common.py
lms/static/sass/course.scss
lms/urls.py
2012-11-16 09:03:15 -05:00
Victor Shnayder
23fa860f2a
Add test files to full test course
...
- I added them when playing with input types, but never merged them in
2012-11-13 10:47:42 -05:00
Chris Dodge
b788b9d659
add to existing test cases to exercise the 'course extras as modules' work in the CMS import. Also add to the existing 'full' test data collection to include policy, tabs, etc.
2012-11-01 15:08:26 -04:00
Calen Pennington
b85fefe61a
Fixing tests that were failing to due static content directory change
2012-09-07 17:02:00 -04:00
Victor Shnayder
048dea0eff
make test course loading deterministic by using course_id
2012-09-06 16:38:33 -04:00
Victor Shnayder
e9ded1cf36
slight refactoring to test file
...
* was going to use to test duplicated content, but we're not supporting that for now
2012-08-28 11:28:10 -04:00
Victor Shnayder
59defd33b6
Formatting and little bugfixes
...
* add course and org to full/course.xml
* fix error path in clean_xml script
* commit rakefile change needed by c5334f150c
2012-07-27 16:09:25 -04:00
Victor Shnayder
9c92aef669
Tweaks to test data for full course
...
* Add extra nested html file
* add a start date
2012-07-27 16:09:25 -04:00
Victor Shnayder
e5117dba13
Mostly fix tests.
...
* change custom tags in test/data/full to new single-tag format
* fix broken file references
* fix argument to import_from_xml
* error_handler fix in mongo.py in next commit
2012-07-27 16:08:23 -04:00
Calen Pennington
29cf09763f
Fixing up cms tests to only use data in common/test/data
2012-07-25 10:09:25 -04:00
Calen Pennington
9458e53988
Adding stripped down 6002x course for testing, along with CMS test for edit pages for same
2012-07-24 16:13:51 -04:00
Victor Shnayder
f87433e346
folders and a bit of initial test data for xml validation
2012-06-21 15:27:19 -04:00
