Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

5589 Commits

Author SHA1 Message Date
Victor Shnayder
3f18e5c3d7 In sign up form, merge PhD-science and PhD-other, add Associate's degree 
Includes corresponding documentation changes.

Per request from Harvard: LH #276
 2013-03-21 17:23:46 -04:00
John Jarvis
57dd2e728c Adding a new cookie to determine logged in status for the edx mktg site 
When a user logs in this will drop a new cookie 'edxloggedin' that will
match the value and expire date of the django session cookie.
When a user logs out the cookie will be removed
 2013-03-21 17:17:35 -04:00
Chris Dodge
63fc2eecaf drive by fix to get proper error handling 2013-03-21 16:32:58 -04:00
Will Daly
6728f16ae4 Merge branch 'feature/zoldak/refactor-factories' into feature/will/speed_up_lettuce_tests 
Conflicts:
	lms/djangoapps/courseware/features/problems.py
 2013-03-21 10:49:04 -04:00
Will Daly
7a282a9c54 Edited comments, ran pep8 2013-03-20 17:08:19 -04:00
Will Daly
f69778b367 Changed lettuce test log_in step to log in programatically 
rather than using the login dialog.
 2013-03-20 17:08:19 -04:00
Jay Zoldak
23364d8b0f Merge branch 'master' into feature/zoldak/refactor-factories 2013-03-20 13:36:01 -04:00
Jay Zoldak
8428119856 Merge pull request #1696 from MITx/feature/will/coderesponse_lettuce_tests 
Feature/will/coderesponse lettuce tests
 2013-03-20 10:20:11 -07:00
Jay Zoldak
5eba299dca Move course and item factories to xmodule.modulestore.tests 2013-03-20 12:10:18 -04:00
Jay Zoldak
192b991334 Pylint for lettuce factory refactor. 2013-03-20 11:52:15 -04:00
Jay Zoldak
6048bc2832 Pep8 fixes for factory refactor 2013-03-20 11:31:12 -04:00
Will Daly
5411fc765e Refactored lettuce test of capa problems to use 
world.css_click() helper instead of directly
calling splinter.
 2013-03-20 11:27:28 -04:00
Jay Zoldak
e45ccbf389 Leave CourseEnrollment factor refactoring as a TODO. 2013-03-20 11:12:54 -04:00
Diana Huang
2415680efd Merge pull request #1677 from MITx/victor/fix-auto-cohorting 
Fix randomness bug in cohort placement
 2013-03-20 07:50:43 -07:00
Jay Zoldak
16773aac63 More factory refactoring. 2013-03-20 09:38:53 -04:00
Jay Zoldak
3576a3154b Repoint factory references in lettuce tests to world. 2013-03-20 09:38:52 -04:00
Jay Zoldak
1c4ffcf122 Fix import statement for test.py 2013-03-20 09:38:52 -04:00
Jay Zoldak
74653ff8ad Factory refactor working for lms lettuce tests. 2013-03-20 09:38:52 -04:00
John Jarvis
01d95b7ebe fixing merge issues 2013-03-19 16:24:23 -04:00
John Jarvis
63d85a52dc fixing merge issues 2013-03-19 16:22:36 -04:00
John Jarvis
78987cc400 resolving merge conflicts 2013-03-19 16:16:32 -04:00
Will Daly
66434d7d05 Moved XQueue mock from terrain into LMS, so that the 
server is not created for cms tests.
 2013-03-19 15:55:05 -04:00
Will Daly
20ccf5937b Implemented CodeResponse lettuce tests 2013-03-19 15:55:05 -04:00
Will Daly
2087b81573 Created MockXQueueServer which listens on a local port 
and simulates an XQueue.
 2013-03-19 15:53:06 -04:00
Will Daly
568f557dfc Pep8 fixes 
Changed constant to uppercase
 2013-03-18 13:57:26 -04:00
Victor Shnayder
d91008b73a Prevent random.Random() from running at import time. 2013-03-15 19:40:47 -07:00
Will Daly
5fd1e7426d Lettuce tests now import one_time_startup.py to ensure 
that mongo caches are initialized for the test database.
This avoids a warning from the mongo modulestore.
 2013-03-15 16:17:45 -04:00
Will Daly
3a13cd7b34 Merged changes in factories.py with version in master 2013-03-15 15:09:39 -04:00
Victor Shnayder
64e1eb9903 Fix randomness bug in cohort placement 
capa re-seeds the global RNG all the time, resulting in non-random
cohort placement.  Switch to using a local random module.

(Thanks Cale for helping me figure this out!)
 2013-03-15 11:35:27 -07:00
Will Daly
e41bb8462c Added lettuce tests for script (customresponse) problems. 
Increased wait time for login screen to reduce false positives.
 2013-03-15 14:04:22 -04:00
Will Daly
8423816076 LMS contentstore lettuce tests now dynamically create courses in mongo 
using terrain.factories.py and capa.tests.response_xml_factory
 2013-03-15 14:04:22 -04:00
Will Daly
e6466fdddc Changed user creation so that it creates the user only if it doesn't 
already exist

Updated login dialog handling to workaround multiple login dialogs
that sometimes appear on a page (where the first one is hidden)
 2013-03-15 14:02:20 -04:00
Will Daly
90213d483c Wrote lettuce tests for drop-down, multiple choice, and checkbox 
problems.
 2013-03-15 14:02:20 -04:00
Calen Pennington
6b64b4214f Make relative imports explicitly relative 2013-03-15 11:23:22 -04:00
Calen Pennington
f1c66e9178 Make common/djangoapps not a python module either 2013-03-15 11:16:15 -04:00
Calen Pennington
531eb80eb2 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.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/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	lms/djangoapps/open_ended_grading/tests.py
 2013-03-13 12:18:04 -04:00
Jay Zoldak
f9f0bd0deb Update course factory to reflect XBlock changes 2013-03-12 14:05:12 -04:00
Victor Shnayder
b06615298f Add logging to debug strange cohort behavior on prod. 
Strange behavior:
  - There are 20 cohorts that users should be randomly assigned
    into in HeroesX
  - Almost all, but not all (e.g. ~3300 / 3400) users end up in the
    same group.
  - testing manually locally and on prod in a django shell shows
    nothing wrong
 2013-03-11 15:24:14 -07:00
Calen Pennington
93db5acc15 Make display_name defaulting explicit 2013-03-08 14:58:09 -05:00
Calen Pennington
8ae336792a Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 2013-03-08 12:00:10 -05:00
Calen Pennington
d9b68e2de2 Merge pull request #1628 from MITx/feature/cale/heartbeat-metrics 
Add datadog metrics capture around heartbeat timing
 2013-03-08 08:59:44 -08:00
Jay Zoldak
1f30baabfd Change default browser for lettuce back to chrome. 2013-03-08 11:15:14 -05:00
Jay Zoldak
21e7bc5128 More robust handling for finding and clicking on objects by css. 
Tag tests not working under PhantomJS to skip for now.
 2013-03-08 11:15:14 -05:00
Calen Pennington
cd802d8e14 Add datadog metrics capture around heartbeat timing 2013-03-08 10:36:59 -05:00
Victor Shnayder
84f05f9f61 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/foldit_module.py
	common/lib/xmodule/xmodule/tests/__init__.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_self_assessment.py
 2013-03-08 00:40:18 -05:00
Chris Dodge
c23c5cc3d9 add comments 2013-03-07 16:12:21 -05:00
Chris Dodge
891bddcdf9 need to support link references to static content that is in the code base (e.g. module's .js/.css) 2013-03-07 14:28:09 -05:00
Calen Pennington
cec3475c9d Remove references to .definition and .metadata in modules 2013-03-06 18:07:56 -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
David Ormsbee
a00f11c1ff Tell user that spaces aren't allowed in usernames (requested by Teppo). 2013-03-04 11:17:29 -05:00