Mario Visic eb5f0557ff Merge branch 'master' into rails_3_1 ... Conflicts: app/models/content_instance.rb spec/models/locomotive/content_instance_spec.rb		2011-12-18 01:18:56 +08:00
..
ability_spec.rb	Lots of fixes to get tets closer to working.	2011-11-20 21:59:12 +11:00
account_spec.rb	Specs now correctly use a multisite test app.	2011-11-25 23:59:44 +11:00
content_asset_spec.rb	Some fixes for the content asset spec.	2011-11-20 22:52:20 +11:00
content_instance_spec.rb	Merge branch 'master' into rails_3_1	2011-12-18 01:18:56 +08:00
content_type_spec.rb	Merge branch 'master' into rails_3_1	2011-12-15 22:29:07 +08:00
editable_element_spec.rb	Specs now run for all models. The account model now passes GREEEEn.	2011-11-20 22:47:41 +11:00
membership_spec.rb	Fixed a bunch of model tests.	2011-11-25 00:37:17 +11:00
page_spec.rb	Specs now correctly use a multisite test app.	2011-11-25 23:59:44 +11:00
site_spec.rb	Fixed a bunch of model tests.	2011-11-25 00:37:17 +11:00
snippet_spec.rb	Lots of spec fixes (mostly namespacing), down to 107 failing specs.	2011-11-26 17:24:34 +11:00
theme_asset_spec.rb	Fixed a bunch of model tests.	2011-11-25 00:37:17 +11:00