Commit Graph

1873 Commits

Author SHA1 Message Date
Ned Batchelder
e947218285 Merge master to here. 2013-05-16 14:21:51 -04:00
Chris Dodge
6cec66979a fix broken tests. Also drive by fix for the sporadic failure on tests which may go to a textbook page. The URL formatting was incorrect in the test 2013-05-15 11:16:47 -04:00
VikParuchuri
e122efc5a3 Merge pull request #1991 from edx/feature/vik/oe-tests
Feature/vik/oe tests
2013-05-13 10:49:33 -07:00
Vik Paruchuri
6dfc490fc7 Json updates 2013-05-13 12:49:01 -04:00
Chris Dodge
1b0eff52ed create test cases to simulate error exporting/importing textbooks 2013-05-10 10:01:10 -04:00
Vik Paruchuri
fd46ebd1fa Move some functions, make notification tests more robust 2013-05-08 19:04:07 -04:00
Vik Paruchuri
1398b55713 Comment touched modules 2013-05-07 15:48:19 -04:00
Vik Paruchuri
258aebed20 Fix anonymoususer 500 error 2013-05-07 12:58:49 -04:00
Jay Zoldak
2ffaea7ade Merge pull request #1949 from edx/fix/zoldak/modulestore-tests
Fix tests that intermittently fail when run in concurrent jobs on jenkins.
2013-05-06 13:32:27 -07:00
Greg Price
ec3c8458e7 Merge pull request #1911 from edx/feature/gprice/feedback-button 2013-05-06 11:03:41 -07:00
Greg Price
00729a8c13 Add an omnipresent help tab to the LMS
The help tab opens a modal dialog that directs the user at various resources
(e.g. the site FAQ and course forums) and allows the user to submit feedback
to the feedback endpoint (which will ultimately create a ticket for the
student support team).
2013-05-06 13:35:52 -04:00
Ned Batchelder
7cb3987f94 Ugh, missing import. 2013-05-06 11:39:21 -04:00
Ned Batchelder
d8c22dbeb3 Add a Django setting for course allowed to run unsafe code. 2013-05-06 11:39:21 -04:00
Will Daly
7b26c50e32 Added instructions for clearing the cache before running tests 2013-05-06 11:39:20 -04:00
Will Daly
ac660ead3e Added load test of CustomResponse 2013-05-06 11:39:20 -04:00
Ned Batchelder
5e7d328e7f Use the Django cache for sandboxed code execution. 2013-05-06 11:39:19 -04:00
Ned Batchelder
ceb6cedaae Fix merge 2013-05-06 11:39:19 -04:00
Ned Batchelder
5acb225816 Print the full traceback when execution fails. 2013-05-06 11:39:17 -04:00
Ned Batchelder
839c568474 Hmm, turns out exec wants just one dict to properly simulate Python module execution. 2013-05-06 11:39:17 -04:00
Ned Batchelder
ec7a04fdb3 A /debug/run_python endpoint for staff to test the sandboxing of Python code. 2013-05-06 11:39:17 -04:00
Ned Batchelder
249ba4be33 Finish the test for computed_answer 2013-05-06 10:55:04 -04:00
Ned Batchelder
a6677aa0a8 Computed answers are run through safe_exec. 2013-05-06 10:55:04 -04:00
Ned Batchelder
6297d64528 Now these can be in the same test class 2013-05-06 10:55:04 -04:00
Ned Batchelder
ff1df569cb Refactor submitting problems so we don't need custom code for each test. 2013-05-06 10:55:04 -04:00
Ned Batchelder
33abe54e0d Work in progress to sandbox the uses of eval in LMS. 2013-05-06 10:55:03 -04:00
Ned Batchelder
9249bafd00 Add a test of a bad answer also. 2013-05-06 10:55:03 -04:00
Ned Batchelder
e69a073161 Add a test for the Python in schemaresponse, and refactor the tests while I was in there. 2013-05-06 10:55:03 -04:00
Ned Batchelder
9827a0e218 Oops, this line can go too. 2013-05-06 10:55:03 -04:00
Ned Batchelder
9cc43f1d9b Simplify this test setup. 2013-05-06 10:55:03 -04:00
Jay Zoldak
8ef88fa5b0 Fix tests that randomly fail when run in concurrent jobs on jenkins. 2013-05-06 10:24:38 -04:00
David Baumgold
b344976fe7 Making linters happier 2013-05-03 15:08:28 -04:00
Greg Price
0f7378a171 Modify UserFactory to create a profile for the user
This allows specification of profile parameters when creating a user. Because
the profile contents are always accessed from the database, the user must be
saved to the database before the profile is created. This means that the
profile cannot be created if the user is merely being built (and not saved)
rather than created.
2013-05-03 10:31:35 -04:00
Diana Huang
2df3fe9344 Revert "fix merge conflict"
This reverts commit acfd0d9fd6, reversing
changes made to e4194c99d8.
2013-04-26 12:40:35 -04:00
Calen Pennington
621a935577 Merge pull request #1858 from MITx/feature/ichuang/masquerade-v3
Allow course staff to masquerade as students in viewing courseware
2013-04-24 04:17:34 -07:00
Your Name
068e02efd5 make unflag all permissions match javascript 2013-04-22 17:51:48 -04:00
Your Name
3f1d97b065 Merge branch 'master' into feature/kevin/flagging 2013-04-22 17:22:33 -04:00
Your Name
5e73e8f286 Merge branch 'master' of github.com:MITx/mitx 2013-04-22 17:22:24 -04:00
Your Name
30104979e7 fix downvoting url 2013-04-22 16:25:16 -04:00
Your Name
af1c411ddf gentler url diff 2013-04-22 16:23:21 -04:00
Your Name
0bcef4ddb7 fix merge conflicts 2013-04-22 12:54:33 -04:00
Your Name
7994e1b344 pep8 fixes 2013-04-22 12:53:30 -04:00
chrisndodge
0eed587571 Merge pull request #1839 from MITx/feature/sef/pressreleases
Press Releases: generic matching rule instead of explicit lines in url.py
2013-04-22 07:01:36 -07:00
ichuang
977eb6530c allow staff to toggle masquerade on info pages (otherwise can get
blocked from courseware pages, if course hasn't started yet)
2013-04-21 21:43:18 -04:00
Kevin Chugh
7bc75844b2 fix indentation 2013-04-21 06:24:23 -04:00
Kevin Chugh
e8c646142f Merge branch 'master' into feature/kevin/flagging 2013-04-21 06:15:55 -04:00
Kevin Chugh
649578ea2f unify flag moderator permissions 2013-04-21 06:15:23 -04:00
ichuang
f1a899ac1c Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/masquerade-v3 2013-04-20 12:25:47 -04:00
ichuang
81621fbe3a for staff masquerading as student be kind and don't 404 for inaccessible content 2013-04-20 12:12:25 -04:00
ichuang
6cbd353992 make masquerade work properly even if DISABLE_START_DATES true 2013-04-20 11:57:56 -04:00
Your Name
0a627bb5d9 update permissions for flagging 2013-04-19 17:40:13 -04:00