Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

212 Commits

Author SHA1 Message Date
Calen Pennington
b3c470ece4 Randomize ports used by jasmine tests 
This prevents multiple tests running in parallel from stomping on each
other.
 2013-04-17 10:57:03 -04:00
Calen Pennington
f252c62f31 Enable test colors in nosetests 
Use setup.cfg to set up default settings when running nose tests. Enable
the rednose library to color test output.
 2013-04-17 09:58:52 -04:00
Vasyl Nakvasiuk
07b3db97a2 remove test rake task 2013-03-19 14:15:52 +02:00
Vasyl Nakvasiuk
9e7258d887 fix rakefile, fix docs 2013-03-19 12:38:08 +02:00
Vasyl Nakvasiuk
911c384527 remove old xml docs, add rake buildpubdocs, showpubdocs, pubdoc 2013-03-18 15:53:07 +02:00
Calen Pennington
a1c375b499 Run pylint on lms/*.py and cms/*.py 2013-03-13 13:30:49 -04:00
Calen Pennington
47ebd2b661 Set pythonpath when running pylint via rake to avoid import errors 2013-03-13 13:20:11 -04:00
Calen Pennington
8a9ba79d1f Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-03-06 12:15:07 -05:00
Calen Pennington
1bfb933518 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	cms/templates/edit_subsection.html
	cms/templates/overview.html
	cms/templates/unit.html
	cms/templates/widgets/header.html
	common/djangoapps/course_groups/tests/tests.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/js/src/.gitignore
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml_exporter.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/open_ended_grading/tests.py
 2013-03-04 16:33:40 -05:00
Chris Dodge
6bacbafb6f move call to update_templates on service startup into a django-admin command 2013-03-04 08:06:58 -05:00
Chris Dodge
816b0edfb0 add another command line argument to allow users to only simulate a delete (i.e. show what items would be deleted). This is a handy sanity checker. 2013-02-25 16:00:35 -05:00
Alexander Kryklia
059b9f66e3 poll and conditional finished 2013-02-15 18:48:39 +02:00
Calen Pennington
4f555f6480 Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model 
Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/module_info_model.py
	cms/djangoapps/contentstore/tests/factories.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/djangoapps/models/settings/course_details.py
	cms/djangoapps/models/settings/course_grading.py
	cms/templates/edit_subsection.html
	common/djangoapps/mitxmako/shortcuts.py
	common/djangoapps/static_replace.py
	common/djangoapps/util/converters.py
	common/djangoapps/xmodule_modifiers.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/abtest_module.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/discussion_module.py
	common/lib/xmodule/xmodule/error_module.py
	common/lib/xmodule/xmodule/html_module.py
	common/lib/xmodule/xmodule/js/src/video/display.coffee
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	common/lib/xmodule/xmodule/raw_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_export.py
	common/lib/xmodule/xmodule/tests/test_import.py
	common/lib/xmodule/xmodule/video_module.py
	common/lib/xmodule/xmodule/x_module.py
	common/lib/xmodule/xmodule/xml_module.py
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/django_comment_client/utils.py
	lms/templates/staff_problem_info.html
	lms/templates/video.html
	rakefile
 2013-02-07 15:12:30 -05:00
Calen Pennington
7fc4081495 Make pylint work on bare .py files from rake 2013-02-06 11:10:54 -05:00
Calen Pennington
0b650122fb Config changes to make pep8 autofixes easier 2013-02-06 11:10:54 -05:00
Ned Batchelder
890f02a232 When installing the local requirements, don't upgrade dependencies. Makes things faster. 2013-01-25 12:26:17 -05:00
chrisndodge
358c56da9e Merge pull request #1297 from MITx/fix/cdodge/filesystem-xml-fixes 
Fix/cdodge/filesystem xml fixes
 2013-01-17 05:55:22 -08:00
cahrens
9818664bb1 storing work 2013-01-15 16:04:34 -05:00
Chris Dodge
39769ea997 allow for optional 'COURSE_DIR' parameter for the import rake target so that we can import only a single course 2013-01-14 22:51:56 -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
7229a9cdaf perform a new merge from master, resolve conflicts 2013-01-03 10:43:03 -05:00
Calen Pennington
16d5a769d2 Add a fasttest rake command that runs both fasttest_cms and fasttest_lms 2012-12-28 14:56:43 -05:00
Calen Pennington
8ba4163557 WIP. Data loads, but not all of it 2012-12-28 14:39:13 -05:00
Chris Dodge
625237601f Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/export 
Conflicts:
	common/lib/xmodule/xmodule/contentstore/content.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
 2012-12-27 14:16:40 -05:00
Chris Dodge
28d9827468 fix up some thumbnail issues. Also we need to manage the user permissions when we clone and delete course 2012-12-27 10:20:28 -05:00
Chris Dodge
b40a8a3e9e implement course clone and delete functionality from the command line 2012-12-20 13:55:15 -05:00
Chris Dodge
95c6719447 initial commit. Add 'import_path' field to the GridFS so that when we export, we know where it originated from 2012-12-12 10:57:06 -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
Calen Pennington
2145ff6d1f Provide more info when django has issues when running from rake, and don't install dependencies of common/lib/libraries before every run of a django command 2012-11-26 11:25:46 -05:00
Calen Pennington
4e3da342d7 Merge pull request #1048 from MITx/feature/cdodge/xlint 
Feature/cdodge/xlint
 2012-11-26 08:11:34 -08:00
Victor Shnayder
03dd7b375a get rid of submodule init--not needed post-askbot 2012-11-17 15:59:12 -05:00
Calen Pennington
650f537763 Merge pull request #1043 from MITx/feature/cale/quieter-jasmine-tests 
Make jasmine testing quieter
 2012-11-16 13:35:45 -08:00
Jay Zoldak
718ce4db28 Get Problem constructor working again, and copy the helper file from lms. 2012-11-16 13:02:38 -05:00
Jay Zoldak
bf6a147c85 Modify rake file to read in spec and src files correctly and also add in the lms helper file for stubRequests, etc. 2012-11-15 15:43:39 -05:00
Calen Pennington
93cc17cf3b Starting to generate jasmine tests for common/lib 2012-11-14 15:03:55 -05:00
Calen Pennington
630c2fa21e Make jasmine testing quieter 2012-11-13 10:55:17 -05:00
Chris Dodge
da3c3e5f20 initial xlint implementation. Accumulate all import errors during XmlModuleStore importing. Also do checks post XmlModuleStore import and assert that the structure (course->chapter->sequential->vertical) is present in the courses. 2012-11-09 13:54:12 -05:00
Chris Dodge
981f5cee45 initial buildout of a 'xlint' test to verify legacy coursewar 2012-11-08 16:07:17 -05:00
Calen Pennington
171e932266 Merge branch 'master' into feature/cale/cms-master 
Conflicts:
	rakefile
 2012-11-08 12:28:40 -05:00
Calen Pennington
e50a442d88 Only try to generate html and xml coverage reports if the source .cover file exists 2012-11-08 12:06:05 -05:00
Calen Pennington
686cab4545 Build all available coverage xml and html, even if some is missing 2012-11-08 11:32:27 -05:00
Ned Batchelder
28bb4724e7 Put the coverage data files in the reports dir, where they will be treated like the disposable things they are. 2012-11-08 11:20:23 -05:00
Ned Batchelder
d3e2e739a7 Add the .coverage files to the clobber task. 2012-11-08 11:20:23 -05:00
Calen Pennington
83e2b362e4 Make reports directory build work correctly 2012-11-08 11:20:23 -05:00
Calen Pennington
0cf46f7636 Namespace the coverage html and xml report generation tasks 2012-11-08 11:20:23 -05:00
Calen Pennington
1968a1dde5 Remove attempt to use virtualenv python when running django-admin commands 2012-11-08 11:20:22 -05:00
Calen Pennington
899132a9bb Force django to run using the python from the virtualenv 2012-11-08 11:20:22 -05:00
Ned Batchelder
3dc23eb131 Coverage xml and html reports are now a separate 'xml' and 'html' step from 'test'. 2012-11-08 11:20:22 -05:00
Calen Pennington
c3f0d31cc9 Split out requirements that come from the local mitx repo and those that come from github, and upgrade the local requirements before running tests 2012-11-08 11:20:16 -05:00
Ned Batchelder
90e3386751 WIP for quieter tests with coverage. 2012-11-08 11:19:33 -05:00