Commit Graph

60355 Commits

Author SHA1 Message Date
Ned Batchelder
28bb4724e7 Put the coverage data files in the reports dir, where they will be treated like the disposable things they are. 2012-11-08 11:20:23 -05:00
Ned Batchelder
d3e2e739a7 Add the .coverage files to the clobber task. 2012-11-08 11:20:23 -05:00
Calen Pennington
83e2b362e4 Make reports directory build work correctly 2012-11-08 11:20:23 -05:00
Calen Pennington
0cf46f7636 Namespace the coverage html and xml report generation tasks 2012-11-08 11:20:23 -05:00
Calen Pennington
17570c4c06 Create xml and html coverage reports 2012-11-08 11:20:23 -05:00
Calen Pennington
1968a1dde5 Remove attempt to use virtualenv python when running django-admin commands 2012-11-08 11:20:22 -05:00
Calen Pennington
899132a9bb Force django to run using the python from the virtualenv 2012-11-08 11:20:22 -05:00
Ned Batchelder
3dc23eb131 Coverage xml and html reports are now a separate 'xml' and 'html' step from 'test'. 2012-11-08 11:20:22 -05:00
Calen Pennington
c3f0d31cc9 Split out requirements that come from the local mitx repo and those that come from github, and upgrade the local requirements before running tests 2012-11-08 11:20:16 -05:00
Calen Pennington
79a08266ad Make pip install during jenkins builds quieter 2012-11-08 11:19:33 -05:00
Calen Pennington
2a457bdc0f Set -e and -x on jenkins build scripts 2012-11-08 11:19:33 -05:00
Calen Pennington
6b28b70e51 Add jenkins files for builds 2012-11-08 11:19: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
Ned Batchelder
7033faf18c Don't show stdout from collectstatic during tests. 2012-11-08 11:19:32 -05:00
Jay Zoldak
50a8cf4aea Add test for course creation 2012-11-08 10:59:09 -05:00
Chris Dodge
7ca49f3a14 remove debug log msg 2012-11-08 10:54:56 -05:00
Chris Dodge
b432db1aba Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/static-tab-edit 2012-11-08 09:55:56 -05:00
Chris Dodge
7dbabce4db fix up styling by reusing existing CSS class names. Also refactor some code regarding the management of static_tabs so that it's in the course as course contains references to static_tabs in the current data model 2012-11-08 09:55:52 -05:00
chrisndodge
e3d65a0c08 Merge pull request #997 from MITx/feature/cale/js-tests
Feature/cale/js tests
2012-11-08 06:44:49 -08:00
Calen Pennington
59ee0c5abf Merge pull request #1018 from MITx/fix/cdodge/delete-last-component-does-not-stick
Fix/cdodge/delete last component does not stick
2012-11-08 05:52:02 -08:00
David Ormsbee
459c5e322f Merge pull request #1024 from MITx/feature/dave/pearson_setup
Simple Pearson Testing
2012-11-07 16:29:29 -08:00
David Ormsbee
e90d321142 Comments, whitespace from review. 2012-11-07 19:28:22 -05:00
Carlos Andrés Rocha
25d482099e Merge pull request #955 from MITx/louis/srt_downloads
Add support for subtitle download link
2012-11-07 15:31:02 -08:00
Victor Shnayder
e3c213dd38 Refactor html and js.
Next:
  - more clear states (logic in python, view in js)
  - style
2012-11-07 18:18:35 -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
Chris Dodge
a99277275d add new files 2012-11-07 15:56:16 -05:00
Chris Dodge
9cc1af5052 first pass at static tab editing. Doesn't yet support drag/drop as well as new tab creation, which needs to modify the policy on the course 2012-11-07 15:27:44 -05:00
Brian Talbot
3b42ea7e9e added basic settings markup and revised sections based on additional fields/info needed 2012-11-07 15:00:48 -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
David Ormsbee
92f2fbf0f8 Ugly, ugly hack needed so that Pearson can test something today, to be replaced by a real implementation later this week or early next. 2012-11-07 13:55:08 -05:00
Victor Shnayder
27cffb9387 Update requirements.txt
Taking out MySQL-python for now because it requires mysql to be installed, so breaks updates on content folks' envs.
2012-11-07 11:39:42 -05:00
Calen Pennington
b7e0625bb4 Merge pull request #971 from MITx/feature/cdodge/import-course-info
implement importing of course info sections as modules in the course
2012-11-07 07:12:30 -08:00
Chris Dodge
87ff18dc56 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info 2012-11-07 09:35:21 -05:00
Chris Dodge
afd8584569 remove explicit 'null' for child collection on saveName on unit code paths. I had seen cases where save was posting back an empty set on renames - deleting the components. But I can no longer reproduce it now. 2012-11-07 09:34:44 -05:00
David Ormsbee
ad93f70e65 Re-add TestCenterUser along with a basic command to make an entry for a given user already in the system. 2012-11-07 09:24:38 -05:00
Calen Pennington
9d92711d25 Merge pull request #1015 from MITx/feature/cdodge/mongo-perf-instrumenting
add django performance metering
2012-11-07 06:14:19 -08:00
Chris Dodge
5f1e5c2d70 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into fix/cdodge/delete-last-component-does-not-stick 2012-11-07 09:14:16 -05:00
David Ormsbee
53c5170dbc Simple PEP8 issues. 2012-11-06 18:14:57 -05:00
Carlos Andrés Rocha
07da271747 Merge pull request #1022 from MITx/ie8patch
revert to using getElementsByClassName in .dialog b/c jQuery was
2012-11-06 14:14:07 -08:00
Don Mitchell
ce623bcf17 revert to using getElementsByClassName in .dialog b/c jQuery was
undefined on the content passed in & whole widget is disabled in ie8.
2012-11-06 17:05:44 -05:00
Calen Pennington
bca0134a35 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2012-11-06 16:13:31 -05:00
Chris Dodge
55c69a1e13 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
Conflicts:
	lms/djangoapps/courseware/module_render.py
2012-11-06 14:20:59 -05:00
Victor Shnayder
a544175bef Merge pull request #1020 from MITx/feature/alex/doc
Feature/alex/doc
2012-11-06 10:32:36 -08:00
Victor Shnayder
5870260e1a Merge pull request #1021 from MITx/feature/ichuang/add_mongo_use_docs
add doc file about use of mongo (by cms+lms)
2012-11-06 10:28:23 -08:00
David Ormsbee
847b2eb7e0 Merge branch 'master' into feature/dave/pearson_setup 2012-11-06 11:54:13 -05:00
Chris Dodge
3f01bef1eb Add changelog information 2012-11-06 10:34:51 -05:00
Vik Paruchuri
b66a559b1d Add some more docs to code, remove some old code that assigned points. 2012-11-06 09:49:00 -05:00
Vik Paruchuri
fee0facd39 Add in some docs for tests, factor out class name in js 2012-11-06 09:30:59 -05:00