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
