Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,710 Commits 1 Branch 0 Tags
2fc96d5fb747167ee4062f2caf6ae84b4e9272bf
Commit Graph

3946 Commits

Author SHA1 Message Date
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
Calen Pennington
93eebdcd97 Merge pull request #1709 from MITx/fix/cdodge/dont-compute-inherited-metadata-on-course-loads-with-depth-zero 
if we're loading a course module with depth = 0, then we don't need to f...
 2013-03-20 12:45:18 -07:00
Chris Dodge
133bd767d5 small refactoring to use a better semantic with regards to the parameter 2013-03-20 15:26:29 -04:00
Chris Dodge
f462cd6efa if we're loading a course module with depth = 0, then we don't need to fetch/compute inherited metadata 2013-03-20 15:14:14 -04:00
Chris Dodge
5dbb153abe ooops. didn't clean up the merge conflicts 2013-03-20 14:32:18 -04:00
Chris Dodge
8849ce084f Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/disable-metadata-inheritence-computation-on-import 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo.py
 2013-03-20 14:29:43 -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
chrisndodge
f7700dfc6a Merge pull request #1700 from MITx/feature/christina/mongo-debug-toolbar 
Reduce pep8 warnings.
 2013-03-20 08:27:32 -07: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
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
Alexander Kryklia
05ba082c8f Merge pull request #1692 from MITx/fix/valera/polls_firefox_button_not_blue 
Bug fix for Polls tool.
 2013-03-20 01:53:15 -07:00
Chris Dodge
e0d1449e91 add a finally statement to be sure to turn back on event firing on writes in case an import throws an exception 2013-03-19 17:42:21 -04:00
cahrens
f5bae8d8e3 Reduce pep8 warnings. 2013-03-19 17:29:06 -04:00
cahrens
b5a587d8d0 Have to explicitly specify safe option on mongo insert, remove, update because the debug toolbar specifies a default of safe=False. 2013-03-19 16:57:19 -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
Valera Rozuvan
0884051b32 Fixed bug where in firefox a marked poll button was not highlighted in blue. 2013-03-19 19:29:09 +02:00
e0d
39d451d92a Merge pull request #1687 from MITx/hotfix/edz/pinning 
Allow backwards compatibility for forums pinning UI.
 2013-03-19 09:31:14 -07:00
Calen Pennington
8fda5af4e4 Comment cleanup 2013-03-19 10:54:46 -04:00
Calen Pennington
0209c883bb Remove trailing whitespace 2013-03-19 10:41:38 -04:00
Calen Pennington
94d3ccf674 Always compute the metadata inheritance tree, even on a course module, so that when walking down the tree, we always get the right data 2013-03-19 10:41:12 -04:00
Jay Zoldak
a70a23a48e Merge pull request #1680 from MITx/feature/will/courseware_lettuce_tests 
Feature/will/courseware lettuce tests
 2013-03-18 12:24:19 -07:00
Chris Dodge
e59b650fab add an array of courses to not refresh the metadata cache on writes. This is needed for imports where we are doing bulk updates otherwise, the DB gets thrashed and the import takes too long, timing out the browser 2013-03-18 15:02:49 -04:00
VikParuchuri
9a59336b5e Merge pull request #1676 from MITx/fix/vik/xblock-state-overwrite 
Fix version handling for combined open ended
 2013-03-18 11:58:38 -07:00
Jay Zoldak
b6e82afb0e Merge pull request #1681 from MITx/fix/will/fix_broken_jasmine_lms_tests 
Fix/will/fix broken jasmine lms tests
 2013-03-18 11:53:22 -07: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
Vik Paruchuri
e4efda9a47 Reformat code 2013-03-15 16:21:36 -04: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
Vik Paruchuri
cd3e88fdd5 Fix version tuples to be a dictionary 2013-03-15 16:05:38 -04:00
Vik Paruchuri
500c4ab86e Convert versions to tuples 2013-03-15 15:40:04 -04:00
Vik Paruchuri
01b1974f50 Address review comment 2013-03-15 15:15:23 -04:00
Will Daly
3a13cd7b34 Merged changes in factories.py with version in master 2013-03-15 15:09:39 -04:00
Vik Paruchuri
b609ab0e6a Convert to using versioninteger class 2013-03-15 15:05:47 -04:00
Vik Paruchuri
405ea8d675 Remove copy.copy 2013-03-15 14:57:48 -04:00
Vik Paruchuri
97839d9de5 Fix default version string integer issues 2013-03-15 14:52:55 -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
Vik Paruchuri
c34666af80 Fix version handling 2013-03-15 14:20:55 -04: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
Your Name
53257a3c47 i need more sleep: 2013-03-15 12:47:28 -04:00
Your Name
68cb63daa8 accidentally deleted models file 2013-03-15 12:42:59 -04:00
Your Name
a761e2e829 make pinning backward compatible 2013-03-15 12:38:28 -04:00
Calen Pennington
f1d4096bcd Mark snippets as raw strings to avoid having to escape backslashes 2013-03-15 11:52:50 -04:00
Calen Pennington
9f99c9004b Fix up capa tests 2013-03-15 11:28:33 -04:00
Calen Pennington
6b64b4214f Make relative imports explicitly relative 2013-03-15 11:23:22 -04:00