Commit Graph

55 Commits

Author SHA1 Message Date
Chris Dodge
855c8bb7e7 add unit test for tab reordering 2013-01-29 13:44:42 -05:00
Chris Dodge
22695d80c7 Merge branch 'master' into feature/cdodge/cms-master-merge4
Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt
2013-01-17 09:15:37 -05:00
Brian Wilson
3b28e328c4 disable export of testcenter_exam from course module (and add test). 2013-01-15 17:54:10 -05:00
Alexander Kryklia
100da2aef9 added gst tests for import 2013-01-15 12:55:20 +02:00
Alexander Kryklia
b0b4a90bd3 added gst tests for export 2013-01-15 12:55:20 +02: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
Brian Wilson
0c1ebd8dfb add toylab test data and test changes, including fix to jump_to 2012-11-30 19:05:26 -05:00
Brian Wilson
9bfa800208 add non-ascii data to toy dataset 2012-11-28 18:28:40 -05:00
Don Mitchell
a9233dfd44 Merge branch 'course-info' into feature/dhm/cms-settings
Conflicts:
	cms/djangoapps/contentstore/views.py
2012-11-19 16:00:27 -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
Calen Pennington
dbcb1adfaf Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
Conflicts:
	lms/static/sass/course/courseware/_courseware.scss
2012-11-13 10:22:42 -05:00
Vik Paruchuri
fee0facd39 Add in some docs for tests, factor out class name in js 2012-11-06 09:30:59 -05:00
Vik Paruchuri
71547e29da Added tests for selfassessment import and export (both pass) 2012-11-06 09:17:35 -05:00
Vik Paruchuri
b209018c46 Adding tests 2012-11-06 09:03:59 -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
Bridger Maxwell
188eeed3a3 Removed accidental symlink. 2012-09-20 17:41:02 -04:00
Bridger Maxwell
997c0ee1c6 Grading test now tries a weighted problem. 2012-09-20 17:38:07 -04:00
Bridger Maxwell
92171ea5da Added course grading test. 2012-09-20 16:56:27 -04:00
Bridger Maxwell
9ce3b83be3 Added a simple course for testing the grading functions. 2012-09-20 13:29:16 -04:00
Calen Pennington
b85fefe61a Fixing tests that were failing to due static content directory change 2012-09-07 17:02:00 -04:00
David Ormsbee
8312ddf01d Merge pull request #629 from MITx/feature/victor/save-course-position
Feature/victor/save course position
2012-09-07 06:42:48 -07:00
Victor Shnayder
048dea0eff make test course loading deterministic by using course_id 2012-09-06 16:38:33 -04:00
Victor Shnayder
739dd8e3f9 fix for multiple url_name hashing bug 2012-09-06 10:12:48 -04:00
Victor Shnayder
79109a6244 Apply attr_map translation to metadata loaded from policy file as well as from xml. 2012-09-03 13:51:20 -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
f81f94ec67 Allow location url_names to contain ':', mapping to / on file load
* New format: {tag}://{org}/{course}/{category}/{name}[@{revision}]
* Updated tests, code
* Added test chapter with : in url_name in toy course
* added test html page with : in url_name
* added a note to docs
2012-08-27 11:37:22 -04:00
Victor Shnayder
a7a9abab44 add a course to test start dates 2012-08-21 16:21:01 -04:00
Victor Shnayder
1dc31ceb8b fix toylab html 2012-08-21 16:09:35 -04:00
Victor Shnayder
f866854411 Load grading policy from policy/{url_name}/grading_policy.json
* with backcompat location /grading_policy.json
2012-08-21 15:00:21 -04:00
Victor Shnayder
eeadf0ba87 Let policies be stored in policies/{url_name}/policy.json
* still backcompat with old mode
2012-08-21 15:00:21 -04:00
Victor Shnayder
c6c95c63ac Keep each course's descriptors separate
* apply policy per-course, even if multiple courses share course and org fields
* keep descriptors separate in xml store, so that if two such courses
  change the same module in different ways, it works.  Such edits will need to
  merged on CMS import...
* add get_instance(course_id, location) method to replace get_item(location).
  Update all the call sites
* tests, including a 2nd toy course with same course and org.
2012-08-20 09:26:16 -04:00
Victor Shnayder
00d9ecd600 New policy organization:
* course roots live in roots/{url_name}.xml
   - one is linked from course.xml

* policies live in policies/url_name.json
  - loaded based on course url_name

* Updated to pass policy through into xml parsing, so it takes effect
  before descriptor constructors are called.

* Update toy test course to new structure, fix up tests
2012-08-16 11:41:19 -04:00
Victor Shnayder
ecf432ad78 Make the simple course pass roundtrip test:
- add 'type' and 'points' to capa_module metadata
- replace old 'title' tag with display_name
2012-08-07 11:06:47 -04:00
Victor Shnayder
e6e290f525 Make initial import-export tests pass.
TODO:
* need unique slugs for errors so they don't overwrite each other on export.
  - try to preserve origin slug.  If not possible, generate random one.

* figure out what metadata to strip.  e.g.
 ({'data': '<problem><p><h1>Finger Exercise 1...'},
    {'data': '<problem points="1" type="lecture"><p><h1>Finger Exercise 1...'},
    False)
  - where did points and type come from?  Do we want them there?


* separate broken and non-broken test courses
2012-08-07 11:06:47 -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
168f76ce5a Add jump_to functionality to lms on mongo
* More tests for mongo modulestore, including tweaks to test files
* add location_to_id method to CourseDescriptors
* Implement path_to_location method in mongo.py
  - TODO: does not handle position in sequences yet.
* fix bug in jump_to view.
2012-07-27 16:08:24 -04:00
Victor Shnayder
eb5989aa99 Ready to implement path_to_location
* Clean up test data for simple, toy courses
* clean up test_mongo.py
* write initial test for path_to_location
* hook up view to use path_to_location

Next: actually implement it :)
2012-07-27 16:08:24 -04:00
Victor Shnayder
f10c4c06b6 Start adding tests for mongo modulestore
* fix up toy course to match current format
* fix github sync test that referred to toy course
2012-07-27 16:08:23 -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
Victor Shnayder
a5bacb4696 add now-mandatory metadata to toy course.xml 2012-07-27 16:08:23 -04:00