Commit Graph

17 Commits

Author SHA1 Message Date
cahrens
c95b44d851 Merge branch 'master' into feature/christina/metadata-ui
Conflicts:
	cms/envs/common.py
	cms/templates/base.html
	common/lib/xmodule/xmodule/combined_open_ended_module.py
2013-05-23 11:41:12 -04:00
David Baumgold
9e864834bd Unify system feedback templates
Also, a SystemFeedback model no longer has a `type`, it has an `intent`. This is
because SystemFeedback views have `type`, as well, and this prevents a naming
collision.
2013-05-22 15:55:55 -04:00
David Baumgold
c628a8a360 Fix test 2013-05-22 15:55:53 -04:00
David Baumgold
6ed5a2aa01 Added tests for Backbone section models 2013-05-22 15:55:52 -04:00
David Baumgold
dc76d71c42 4-space indents for coffeescript 2013-05-22 15:55:52 -04:00
David Baumgold
4af3325976 Move display logic into view
Model shouldn't know about things like close buttons, visibility, and so on
2013-05-22 15:55:51 -04:00
David Baumgold
fedfe8627f Add tests for click events on views 2013-05-22 15:55:51 -04:00
David Baumgold
39f81df476 Added a few more tests for feedback models 2013-05-22 15:55:50 -04:00
David Baumgold
e440580c79 Started writing Backbone tests
Hacking the Python, because our JS dependency management is borked.
2013-05-22 15:55:50 -04:00
cahrens
4facd262bd Jasmine test for metadata model. 2013-05-20 16:26:48 -04:00
cahrens
235ecff28b In progress. 2013-05-16 10:40:48 -04:00
Calen Pennington
255720abd7 Clean old javascript tests from CAS 2012-10-31 13:21:36 -04:00
Victor Shnayder
77175872cc Fix some of the CMS jasmine tests.
* still a few that I haven't tracked down...
2012-08-08 13:14:54 -04:00
Prem Sichanugrist
f71e54cc9b Removed unused Week Model 2012-07-06 11:28:02 -04:00
Prem Sichanugrist
95cf25c1dc Fix quote convention in tests 2012-07-06 00:35:00 -04:00
Prem Sichanugrist
8979b993ef Add blank spec for CMS.Models.Week 2012-07-05 21:33:19 -04:00
Prem Sichanugrist
fe17c37783 CMS.Models.Module tested 2012-07-05 21:31:32 -04:00