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

19654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lapentab
dece800888 Renames self.get_test_system to test_system, removes duplicate function. 2013-06-19 09:57:16 -04:00
Calen Pennington
fc6043876a Install python and node prerequisites before trying to run django-admin 2013-06-19 09:01:52 -04:00
Calen Pennington
2de645599a Remove trailing whitespace 2013-06-19 09:01:30 -04:00
Calen Pennington
03605ab686 Don't print error messages if log/db/data directories already exist 2013-06-19 09:01:20 -04:00
Jason Bau
084160c1c9 Finishing up tests/modifications per @ormsbee feedback 2013-06-19 00:48:18 -07:00
Jason Bau
ca649d3c33 Turn off Agreement to Terms of Service for Stanford shib 
As stipulated by Stanford's office of general counsel
 2013-06-19 00:48:18 -07:00
Jason Bau
a39a384ed2 Handle the case where an existing user has email returned by shib 
By linking the users
 2013-06-19 00:48:18 -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
Jason Bau
23631b839a AWS settings hook for addl installed apps + lms/wsgi_apache.py 
wsgi_apache.py passes an apache env variable for SERVICE_VARIANT
to the os environment, where it's normally set when we use gunicorn
 2013-06-19 00:48:17 -07:00
Renzo Lucioni
841ff4765f Abridge tests in light of learning how Segment.io works 2013-06-18 17:58:10 -04:00
Will Daly
b82eedbefd Merge pull request #184 from edx/will/fix-diff-cover-bug 
Fix a bug in diff-cover
 2013-06-18 14:32:46 -07:00
Don Mitchell
1ff022e181 Incidental pep8 changes 2013-06-18 17:25:06 -04: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
brianhw
54a3bc620b Merge pull request #40 from edx/feature/brian/regrade-celery-2 
Feature/brian/regrade celery 2
 2013-06-18 12:36:36 -07:00
cahrens
9878c75b7a Sometimes the first click doesn't actually work, so call click up to 5 times. 
This seems to fix the sporadic failure (at least on my machine).
 2013-06-18 15:22:25 -04:00
Peter Fogg
7633968701 Merge branch 'master' into peter-fogg/remove-video-xml 2013-06-18 15:07:58 -04:00
Brian Wilson
fd206a4128 Make sure InstructorTask is committed. 2013-06-18 15:07:15 -04:00
Brian Wilson
5389bba490 Add changelog entry. 2013-06-18 14:28:00 -04:00
Renzo Lucioni
305e9315ef Write Jasmine tests to prove Segment.io works in Logger 2013-06-18 14:27:43 -04:00
lapentab
f0fb620be6 Fixes missing refactoring 2013-06-18 14:12:23 -04:00
JonahStanley
9dc1262719 This was causing some failures in the unit tests for some reason 2013-06-18 13:58:58 -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
Brian Wilson
2d1ebb7329 Test when querying for a non-existent task 2013-06-18 13:51:05 -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
Calen Pennington
c5dc404b01 Merge pull request #150 from edx/fix/cale/update-django-wiki 
Cherry pick change to url matching regular expression. Fixes LMS-37
 2013-06-18 10:29:33 -07:00
chrisndodge
c74220779e Merge pull request #201 from edx/fix/cdodge/fix-busted-JS-pipeline 
remove assets.js from the PIPELINE_JS since it seems to cause that file ...
 2013-06-18 10:21:51 -07:00
JonahStanley
0b51f1bbba Merge branch 'master' into jonahstanley/add-courseteam-tests 2013-06-18 13:20:13 -04:00
JonahStanley
85e3062225 Fixed click to comply to new css_click 2013-06-18 12:51:18 -04:00
JonahStanley
ce3bc1e1cb Merge branch 'master' into jonahstanley/add-gradingsettings-tests 2013-06-18 12:47:30 -04:00
Don Mitchell
cf2675d701 Update fields.py 
When changing variable names for code review critique, accidental cut/paste prevented intended behavior.
 2013-06-18 12:32:26 -04:00
Don Mitchell
b151d6c155 Merge pull request #183 from edx/dhm/timeconv/bug0 
Fix a few remaining tz naive dates
 2013-06-18 09:09:24 -07:00
Don Mitchell
a1f181e7bb Make the variable and method names clearer 2013-06-18 11:45:16 -04:00
Chris Dodge
54cb64a2c6 actually, seems like if we remove it from PIPELINE_JS then it doesn't work in production 2013-06-18 11:37:50 -04:00
lapentab
b93f00e02f Rename system_test to get_test_system 2013-06-18 11:37:24 -04:00
David Baumgold
02626ffda7 Removed unused test code 2013-06-18 11:27:13 -04:00
JonahStanley
650a2ba423 Added deletion tests 2013-06-18 11:20:23 -04:00
Brian Wilson
77032067ac Refactor test_views from test_api. Pull out pending_tasks.js. 2013-06-18 11:19:25 -04:00
Chris Dodge
c129fa4a77 remove assets.js from the PIPELINE_JS since it seems to cause that file to be loaded twice 2013-06-18 11:17:29 -04:00
Brian Wilson
c2aadbfb18 Fix issue with unicode in errors. 2013-06-18 11:17:17 -04:00
Brian Wilson
a8c3e91051 Handle failure task_output that won't fit in the model column. 2013-06-18 11:17:17 -04:00
Brian Wilson
eb1fe899e8 Fix progress reporting. 2013-06-18 11:17:17 -04:00
Brian Wilson
2c5e038f82 initial test_tasks 2013-06-18 11:17:17 -04:00
Brian Wilson
3bd2b08258 factor out InstructorTaskTestCase base class, for reuse in test_tasks. 2013-06-18 11:17:16 -04:00
Brian Wilson
a0dcc97e08 tasks now extract task_input and course_id from InstructorTask, instead of passing explicitly. 2013-06-18 11:17:16 -04:00
Brian Wilson
a67674fe34 set task_id on LMS side. 2013-06-18 11:17:16 -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
chrisndodge
a3c7ece85b Merge pull request #195 from pdehaye/patch-1 
need to import os
 2013-06-18 08:16:55 -07:00
Brian Wilson
d2b3977f57 Add dogstat logging to background tasks. 2013-06-18 11:13:55 -04:00