Commit Graph

384 Commits

Author SHA1 Message Date
Diana Huang
bbc5cd50bc Add in default value for MOCK_PEER_GRADING 2013-01-07 15:49:48 -05:00
Diana Huang
e1ec4eec71 Get tests to pass by creating a mock peer grading service 2013-01-07 14:46:32 -05:00
Diana Huang
ad63c492be Minor updates to the page to handle showing Calibration feedback.
Also, allow for the hiding of the Prompt and the Rubric.
2013-01-04 12:42:38 -05:00
Diana Huang
28501ca58e Merge branch 'master' into diana/peer-grading-views 2013-01-03 16:23:14 -05:00
David Ormsbee
2daddff2ef Merge pull request #1217 from MITx/feature/zoldak/lms-acceptance-testing
Merge the lettuce acceptance test framework to master
2013-01-03 09:06:47 -08:00
valera-rozuvan
62271fe5c6 Added namespaced RequireJS. 2013-01-03 10:14:06 +02:00
Jay Zoldak
56d17d8a8a Improve some comments and names in the acceptance test framework 2013-01-02 10:44:21 -05:00
Jay Zoldak
d5111b9ed9 Get lettuce tests running against test database 2013-01-02 10:44:21 -05:00
Jay Zoldak
6df565e468 Interim work on open-ended grading acceptance testing POC 2013-01-02 10:44:20 -05:00
Jay Zoldak
20cc930312 Bring over acceptance test changes from cms master branch. 2013-01-02 10:44:20 -05:00
Jay Zoldak
0a77dd4431 Smart accordion walkthrough working for cms-master branch
Conflicts:
	lms/envs/cms/acceptance.py
2013-01-02 10:44:19 -05:00
Jay Zoldak
668bc81d7f New branch for clean lms acceptance tests 2013-01-02 10:44:19 -05:00
Diana Huang
deffa188ff Fix some minor problems and add new key for peer grading. 2013-01-02 09:43:21 -05:00
Diana Huang
652a8eb440 New peer grading view on the lms side 2012-12-28 15:48:06 -05:00
Diana Huang
ecf04b3e49 Refactor existing grading logic into a new app. 2012-12-28 11:29:29 -05:00
David Ormsbee
5171fe6871 Merge pull request #1199 from MITx/fix/zoldak/test-logger-settings
Remove logger setting override from test settings configuration file.
2012-12-21 12:22:47 -08:00
Jay Zoldak
3bbfb4851b Remove logger setting override from test settings configuration file. 2012-12-21 10:25:14 -05:00
Carlos Andrés Rocha
5d85fab283 Fix django auth login redirection
The django authentication decorator login_required, redirects to
settings.LOGIN_URL. If it is missing, it redirects to /accounts/login.

We did not have the setting enable, not a proper page where to
redirect. This cause users not logged in to see a 404 error when
accessing courseware directly, by using a link or a bookmark.

[#41499213]
2012-12-19 18:48:30 -05:00
David Ormsbee
e3b4d78d87 IE7 compatibility: no trailing commas in arrays, including the third party json2.js lib because IE<8 has no JSON object. 2012-12-07 16:03:05 -05:00
David Ormsbee
7596deb40a Merge pull request #1094 from MITx/feature/victor/instructor-grading
Feature/victor/instructor grading
2012-12-07 08:44:58 -08:00
Victor Shnayder
53580af952 fix aws setting name 2012-12-07 10:35:44 -05:00
Calen Pennington
251f552e64 Don't try and send exceptions to newrelic with a busted logging interface 2012-12-03 14:30:36 -05:00
Victor Shnayder
835f18795a Make tests pass again 2012-11-30 10:27:34 -05:00
Victor Shnayder
d28cd4f429 use a dict for backend config. Load it on aws. 2012-11-30 10:03:31 -05:00
Victor Shnayder
b48b389a56 implement login into staff grading service. 2012-11-30 10:03:31 -05:00
Victor Shnayder
edd3277597 Tweaks to actually work with the backend.
- specify mime type
- right urls
2012-11-30 10:03:31 -05:00
Victor Shnayder
ff11926570 Initial impl and basic access tests for staff grading service 2012-11-30 10:00:01 -05:00
Victor Shnayder
7d1d135c16 Wire in some initial js. 2012-11-30 09:51:34 -05:00
David Ormsbee
156dc1fb6c Merge branch 'master' into feature/victor/actual-askbot-removal
Conflicts:
	lms/envs/aws.py
2012-11-15 14:24:55 -05:00
Victor Shnayder
2846c61d15 Revert "remove (almost) all references to askbot."
This reverts commit 793354a0dc.
2012-11-09 18:18:37 -05:00
John Jarvis
01dcf291b6 Adding setting variable for CERT_QUEUE 2012-11-09 18:18:36 -05:00
Victor Shnayder
76f0cf4a86 remove (almost) all references to askbot. 2012-11-09 18:18:33 -05:00
Ned Batchelder
90e3386751 WIP for quieter tests with coverage. 2012-11-08 11:19:33 -05:00
Ned Batchelder
7eb196df38 Run coverage directly instead of as a plugin. Also quiet the install and clean steps of tests. 2012-11-08 11:19:33 -05:00
David Ormsbee
ab0e7cf4ae Change AUTH_TOKENS index reference to a get so it doesn't explode the whole app if I did Puppet incorrectly. 2012-11-07 17:36:50 -05:00
David Ormsbee
4b02b2af2a Rearrange how we handle the auth tokens for our fake Pearson preliminary testing 2012-11-07 17:20:49 -05:00
David Ormsbee
528fcd7f4e Create a config option for enabling a Pearson login in a totally hacky manner. 2012-11-07 14:08:55 -05:00
Victor Shnayder
11fc6e4c51 put back file upload config--needed for new discussion forums 2012-10-30 21:36:15 -04:00
Victor Shnayder
8c27e3a249 Revert overly aggressive killing.
(don't worry--askbot is still dead)
2012-10-30 20:49:10 -04:00
Victor Shnayder
793354a0dc remove (almost) all references to askbot. 2012-10-30 18:23:07 -04:00
Carlos Andrés Rocha
76ffbfc4a1 Increase the limit of files that can be uploaded by a student 2012-10-23 17:26:00 -04:00
Victor Shnayder
f50519ae48 Merge pull request #906 from MITx/victor/test-speedup
Victor/test speedup
2012-10-22 10:45:23 -07:00
Carlos Andrés Rocha
24d5c9162c Created Django App with commands to import software license numbers per class. 2012-10-15 18:46:31 -04:00
Victor Shnayder
4bf9323eed More test speedups:
- Add tasks to test lib without coverage
- Add a coverage flag to test.py (set to True, for manual tweaking for now)
2012-10-15 02:23:00 -04:00
Victor Shnayder
3f3df3fdb4 remove no-longer-used test dbs 2012-10-15 01:48:46 -04:00
Victor Shnayder
bc96203807 Use a faster hashing algorithm for testing
http://slacy.com/blog/2012/04/make-your-tests-faster-in-django-1-4/

rake fasttest_lms goes from 48 to 26 seconds.
2012-10-15 01:34:45 -04:00
Victor Shnayder
9e43664498 Add support for per-course site status.
Now looks for a status_message.json file, looks for 'global' and ${course.id} keys. Return any global message and any course-specific message, joined by <br>.

fab files need to be updated to use this new format (new filename, possibly also help manage per-course messages, or at least test for valid json)
2012-10-07 23:09:26 -04:00
David Ormsbee
13c8cbf5af Merge pull request #807 from MITx/feature/victor/status-banner
Feature/victor/status banner
2012-10-02 14:19:36 -07:00
Victor Shnayder
f4623bf155 address comments on #807 2012-10-02 17:17:15 -04:00
Victor Shnayder
8ad1e7fba1 Add framework for a site status banner.
- still needs style
- will cache for 10 seconds
2012-10-02 11:48:16 -04:00