Files

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

data

Merge branch 'master' into feature/cdodge/cms-master-merge4

2013-01-17 09:15:37 -05:00

phantom-jasmine @ a54d435b55

Make rake commands to run jasmine tests in browser and via phantomjs

2012-10-30 10:41:02 -04:00

README.md

folders and a bit of initial test data for xml validation

2012-06-21 15:27:19 -04:00

README.md

Common test infrastructure for LMS + CMS

data/ has some test course data.

Once the course validation is separated from django, we should have scripts here that checks that a course consists only of xml that we understand.