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

211 Commits

Author SHA1 Message Date
JonahStanley
676da2d592 Removed set trace 2013-07-11 10:12:10 -04:00
JonahStanley
7fb5f505d6 Refactored out full from the lms tests 2013-07-11 10:12:06 -04:00
ihoover
5a03d93000 refactor login and enrollment test cases to use the mongo modulestore 
added namee to authors file
 2013-07-10 10:34:14 -04:00
Ned Batchelder
31a72093e0 Fix broken tests by simplifying the CourseFactory 
The data argument was being treated specially, but that was just
because we didn't have **kwargs support.  Now we do.  There are
two uses of data=, one we convert to kwargs, the other was actually
unused, so remove it completely.
 2013-07-03 17:04:18 -04:00
Jean Manuel Nater
5cb4c1a750 Removed some pep8 violations. 2013-07-01 17:07:24 -04:00
Jean Manuel Nater
72b4561e3a Moved xml_store_config, mongo_store_config, and draft_mongo_store_config to xmodule/modulestore/tests/django_util.py 
Removed some repeated instances of xml_store_config.
Reverted some changes to mongo_store_config so each modulestore gets it's own uuid.
 2013-07-01 14:45:53 -04:00
Valera Rozuvan
97d7421432 Fix for bug Blades/BLD-152. Added test for bugfix. Optimized bug fix. 2013-06-28 13:52:04 +03:00
Jean Manuel Nater
3e0f933a73 Formatted a docstring. 2013-06-27 16:40:04 -04:00
Jean Manuel Nater
3c67e2754a Merge branch 'master' into jnater/courseware_tests 
Conflicts:
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/instructor/tests/test_enrollment.py
 2013-06-27 13:53:47 -04:00
Sarina Canelake
02a24716c6 Merge pull request #278 from edx/sarina/fix-modulestore-500s 
Catch InvalidLocationError
 2013-06-27 08:33:45 -07:00
Jean Manuel Nater
7f017d0ca9 Addressed pull request feedback 2013-06-26 17:19:13 -04:00
Sarina Canelake
f7d6d14946 Catch InvalidLocationError 2013-06-26 15:24:48 -04:00
Don Mitchell
b42fe277d4 Add serial commas to modulestore definitions 2013-06-25 22:34:36 -04:00
Jean Manuel Nater
c4c68f516b Removed some unnecessary imports. 2013-06-24 17:31:49 -04:00
Jean Manuel Nater
1b344e4d4d Removed some unused functions. 2013-06-24 17:20:59 -04:00
Jean Manuel Nater
7fd1190505 Updated a doc string. 2013-06-24 17:13:33 -04:00
Jean Manuel Nater
986b63d85d Removed run_wrapped() and replaced its functionality with patch.dict(): 2013-06-24 17:07:43 -04:00
Jean Manuel Nater
e44ef1a54e Removed the use of random.choice() 2013-06-24 16:24:09 -04:00
Jean Manuel Nater
32a0a2d29d In the middle of addressing pull request comments. This is a safety commit in case I have to revert some changes I'm about to make. 2013-06-24 11:13:59 -04:00
Jean Manuel Nater
1b94050ef6 Merge branch 'master' into jnater/courseware_tests 
Conflicts:
	lms/djangoapps/open_ended_grading/tests.py
 2013-06-21 16:38:31 -04:00
Jean Manuel Nater
9bfddd4891 Addressed pull request feedback. 2013-06-21 14:05:57 -04:00
Jason Bau
07e56ac43b Merge pull request #67 from edx/features/jbau/stanford-shib 
Shibboleth Auth
 2013-06-21 09:32:30 -07:00
Ned Batchelder
3eec09b87a Merge pull request #216 from edx/ned/remove-unused-imports 
Ned/remove unused imports
 2013-06-20 14:15:31 -07:00
Felix Sun
c00721bbe6 Fixed the preferences scope of xblock. 
Added self to authors.

Conflicts:
	AUTHORS
	CHANGELOG.rst
 2013-06-20 10:17:25 -04:00
Ned Batchelder
61b53713d2 Remove unused imports from lms, as detected by pylint. 2013-06-19 16:56:34 -04:00
lapentab
24bee17da5 Merge pull request #156 from edx/blapenta/fix-test-coverage 
Fix test_system looking like a test to nosetest. Fix class inheritance causing double counting of coverage.
 2013-06-19 08:50:54 -07:00
Jason Bau
824fb9a311 The bulk of Shibboleth authentication for Stanford 
Highlights:
* The url '/shib-login/' interfaces with apache/mod_shib via
  request.META to handle shibboleth login and registrations
* Courses can designate 'enrollment_domains' to limit enrollment
  to users with a linked ExternalAuthMap verified by a particular
  identity provider
* Tests
* Logging

 Changes to be committed:

	new file:   common/djangoapps/external_auth/migrations/0001_initial.py
	new file:   common/djangoapps/external_auth/migrations/__init__.py
	new file:   common/djangoapps/external_auth/tests/test_shib.py
	modified:   common/djangoapps/external_auth/views.py
	modified:   common/djangoapps/student/views.py
	modified:   common/lib/xmodule/xmodule/course_module.py
	modified:   lms/djangoapps/courseware/access.py
	modified:   lms/djangoapps/courseware/tests/test_access.py
	modified:   lms/envs/common.py
	modified:   lms/envs/dev.py
	modified:   lms/envs/test.py
	modified:   lms/templates/courseware/course_about.html
	modified:   lms/templates/dashboard.html
	modified:   lms/templates/extauth_failure.html
	modified:   lms/templates/navigation.html
	modified:   lms/templates/register.html
	modified:   lms/templates/signup_modal.html
	modified:   lms/urls.py
	renamed:    lms/wsgi_apache.py -> lms/wsgi_apache_lms.py
 2013-06-19 00:48:18 -07:00
Jean Manuel Nater
905d884aa7 Removed a unnecessary imports from mongo_login_helpers.py and repeated code from tests.py. 2013-06-18 15:41:53 -04:00
lapentab
f0fb620be6 Fixes missing refactoring 2013-06-18 14:12:23 -04:00
Jean Manuel Nater
97275a3286 Refactored some of the classes in tests.py to not unnecessarily depend on the XML modulestore. 
Conflicts:
	lms/djangoapps/courseware/tests/test_navigation.py
	lms/djangoapps/courseware/tests/test_view_authentication.py
	lms/djangoapps/courseware/tests/tests.py
 2013-06-18 13:54:16 -04:00
lapentab
b9ca9a84d7 Merge branch 'master' into blapenta/fix-test-coverage 
Conflicts:
	AUTHORS
	common/lib/xmodule/xmodule/tests/test_annotatable_module.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_conditional.py
	common/lib/xmodule/xmodule/tests/test_html_module.py
	common/lib/xmodule/xmodule/tests/test_progress.py
	common/lib/xmodule/xmodule/tests/test_xml_module.py
	lms/djangoapps/courseware/tests/__init__.py
 2013-06-18 13:41:53 -04:00
Jean Manuel Nater
78128e7672 Merge branch 'master' into jnater/playground 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
	lms/djangoapps/courseware/tests/tests.py
 2013-06-18 13:36:24 -04:00
lapentab
b93f00e02f Rename system_test to get_test_system 2013-06-18 11:37:24 -04:00
Brian Wilson
b224f4e8cc move test_tasks to test_integration. 2013-06-18 11:17:16 -04:00
Brian Wilson
c48dabc383 Move code to instructor_task Django app. 2013-06-18 11:17:15 -04:00
Brian Wilson
d2b3977f57 Add dogstat logging to background tasks. 2013-06-18 11:13:55 -04:00
Brian Wilson
9e11a5659f Rename task_queue.py to task_submit.py. 2013-06-18 11:13:19 -04:00
Brian Wilson
c676cfd64a Rename fields in CourseTaskLog, including a task_key column for indexing. Use 'rescore' instead of 'regrade'. Clean up task submission. 2013-06-18 11:13:19 -04:00
Brian Wilson
76773c5bdf Change updating of CourseTaskLog to mostly occur in worker thread. 2013-06-18 11:13:18 -04:00
Brian Wilson
3b657d6d36 Disable randomized-problem test until bug-fix is merged in. 2013-06-18 11:13:18 -04:00
Brian Wilson
9c1881e5d6 Add unit test to regrade problem using randomization. 2013-06-18 11:13:18 -04:00
Brian Wilson
d37ebea6c0 Add tracking calls to reset (and delete). Add tests for delete. Remove sleep statement used for manual testing. 2013-06-18 11:13:18 -04:00
Brian Wilson
1984cfecc1 Add duration to task status. Add tests for reset-attempts. 2013-06-18 11:13:17 -04:00
Brian Wilson
297206f260 Add background task history to instructor dash (as table). 
Add task-history-per-student button, and fix display of task messages.
 2013-06-18 11:13:01 -04:00
Brian Wilson
8872fbccd2 Add factory for CourseTaskLog. 
Add unit tests for regrading at courseware level (task and task_queue).
 2013-06-18 11:09:32 -04:00
Vasyl Nakvasiuk
80f38b8f3c python tests for videoalpha 2013-06-18 16:30:14 +03:00
Calen Pennington
82606a062c Make XModuleDescriptor use __init__ from XBlock 
Fixes JIRA LMS-203
 2013-06-17 13:38:57 -04:00
Calen Pennington
438ac3b1a4 Move video xmodule tests to xmodule directory 2013-06-17 13:38:29 -04:00
Jean Manuel Nater
07486a4dbc Refactoring the code in tests.py to remove unnecessary dependencies on the XML Modulestore. 2013-06-17 11:54:16 -04:00
Calen Pennington
e791e84ea7 Remove the stores_state field from XModule 
stores_state is now only used in a single test, in conjunction with
has_score. In practice, it's never the case that stores_state is false
when has_score is true, so we can delete stores_state entirely, and just
use has_score for the grading test.
 2013-06-13 14:38:59 -04:00