Commit Graph

18 Commits

Author SHA1 Message Date
Brian Wilson
c639799a07 fix missing import 2013-03-27 18:12:48 -04:00
Brian Wilson
bb7bc88847 merge out from master 2013-03-27 18:04:58 -04:00
Brian Wilson
99778b1b5b add fixes for 500 bugs (lighthouse 287 and 293) by requiring login for accessing licenses and inline discussions. Add unit tests for licenses, and rearrange tests based off of (the former) PageLoad. Also cleanups for pylint and pep8. 2013-03-27 17:59:56 -04:00
Calen Pennington
2c0e5b82ff Return a 403 when an anonymous user attempts to hit modx_dispatch. Fixes https://www.pivotaltracker.com/story/show/46916015 and https://www.pivotaltracker.com/story/show/46916029 2013-03-27 07:29:22 -04:00
Calen Pennington
6b64b4214f Make relative imports explicitly relative 2013-03-15 11:23:22 -04:00
Calen Pennington
8a9ba79d1f Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
2013-03-06 12:15:07 -05:00
Jay Zoldak
b0a018195a Pep8 fixes for tests 2013-03-05 11:53:00 -05:00
Jay Zoldak
cee24c5cb2 Import existing UserFactory 2013-03-05 11:18:07 -05:00
Will Daly
437aadb28e Cleaned up some tests; deleted skip tests 2013-03-05 09:32:20 -05:00
Will Daly
faf5c3f0a2 Updated Deena's tests after merge with master to ensure that none
of the tests fail.  Deleted some tests.
2013-03-05 09:10:02 -05:00
Deena Wang
d9fdccb567 testing testing tests 2013-01-29 14:23:55 -05:00
Deena Wang
7918c35414 fixing up tests 2013-01-28 15:29:55 -05:00
Deena Wang
9663973038 more tests for courseware/views 2013-01-24 14:59:46 -05:00
Deena Wang
61e12f57e7 experimenting with creating a course 2013-01-24 09:59:33 -05:00
Deena Wang
ca185c034f Merge branch 'feature/deena/testing' of https://github.com/MITx/mitx into feature/deena/testing
Conflicts:
	lms/djangoapps/courseware/tests/test_module_render.py
2013-01-23 10:50:37 -05:00
Jay Zoldak
26ee9a24ef Add test for TOC rendering 2013-01-22 15:15:47 -05:00
Deena Wang
6e773909e4 added test_views 2013-01-22 10:36:05 -05:00
Deena Wang
1565cd5bd3 Test cases for lms/djangoapps/courseware/module_render in test_module_render 2013-01-18 14:44:17 -05:00