98 Commits

Author	SHA1	Message	Date
Victor Shnayder	8d76556729	Merge pull request #1531 from MITx/fix/cdodge/serializing-ints-as-empty-strings ... Fix/cdodge/serializing ints as empty strings	2013-02-21 12:12:44 -08:00
Jay Zoldak	9eb2766943	Change test modulestore naming differentiation scheme to uuid	2013-02-21 13:07:14 -05:00
Chris Dodge	bc1ee3dbfa	Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/serializing-ints-as-empty-strings	2013-02-21 12:56:20 -05:00
Chris Dodge	041d28f0e9	use better variable names to assert that the expected item was indeed loaded	2013-02-21 12:56:17 -05:00
Chris Dodge	fa3402a977	template name got changed. Need to reflect that on test.	2013-02-21 12:25:10 -05:00
Chris Dodge	bb75a23101	Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/serializing-ints-as-empty-strings	2013-02-21 11:58:52 -05:00
David Ormsbee	3494d58450	Merge pull request #1532 from MITx/feature/ned/clean_up_tests ... Make sure temp directories are properly cleaned up so running tests does...	2013-02-21 08:52:09 -08:00
Ned Batchelder	c3b571bf9b	Make sure temp directories are properly cleaned up so running tests doesn't leave them behind.	2013-02-21 11:38:45 -05:00
Don Mitchell	ba7959fc4d	Merge pull request #1511 from MITx/feature/cdodge/metadata-inheritence-crawling ... Feature/cdodge/metadata inheritence crawling	2013-02-21 08:29:54 -08:00
Chris Dodge	a7f6545cbc	add unit test	2013-02-21 11:22:20 -05:00
Chris Dodge	bd188f92ef	put back the inheritable_metadata list into the XModuleDescriptor class. Also extend the metadata_inheritance test case	2013-02-20 16:20:39 -05:00
Jay Zoldak	8c423da6db	Updated test to reflect new class name for course titles.	2013-02-19 13:50:40 -05:00
Chris Dodge	1a2e794126	add test of inheritance on xmodule insert	2013-02-19 09:51:07 -05:00
Brian Talbot	a5e2b5c53a	resolving merge conflict and missing Sass mixin	2013-02-15 14:10:52 -05:00
Brian Talbot	6c95460761	studio - resolving merge from master	2013-02-15 09:15:06 -05:00
Don Mitchell	bfcc0559a7	Merge pull request #1503 from MITx/fix/cdodge/export-policy-json ... add exporting of policy.json	2013-02-14 12:47:37 -08:00
Chris Dodge	ea068d4aa8	add exporting of policy.json	2013-02-14 14:19:38 -05:00
Don Mitchell	6e5968e2cd	html changed; so, removed mostly meaningless comparison and fixed one.	2013-02-13 11:53:26 -05:00
Christina Roberts	0b91c1c346	Merge pull request #1487 from MITx/fix/cdodge/cleanup-deleted-templates ... clean up templates that were removed from disk - we need to remove from ...	2013-02-13 06:29:35 -08:00
Chris Dodge	fbe3d29f19	added tests	2013-02-13 09:25:09 -05:00
Carlos Andrés Rocha	dff0c10b7a	Merge pull request #1493 from MITx/bug/dhm/misc ... Fix broken test and don't pass time units as strings but as ints.	2013-02-12 15:14:37 -08:00
Don Mitchell	c904174bb7	Fix broken test and don't pass time units as strings but as ints.	2013-02-12 17:30:57 -05:00
Ned Batchelder	aa2d0ecaf2	We no longer need override_settings, Django has a better one.	2013-02-11 17:06:35 -05:00
Chris Dodge	33009eba7d	add exporting of grading_policy.json	2013-02-11 14:30:26 -05:00
Calen Pennington	cfae1cdf62	Pep8 autofixes	2013-02-06 11:13:50 -05:00
Jay Zoldak	72023cb5d2	Improve docstring wording for ModuleStoreTestCase class.	2013-02-06 10:42:21 -05:00
Jay Zoldak	abf4ad36f4	Move modulestore unique naming in tests from the settings.py file into the ModuleStoreTestCase class.	2013-02-06 10:42:21 -05:00
Jay Zoldak	fde6d1ba1c	Refactor tests for cms contentstore.	2013-02-06 10:42:21 -05:00
Jay Zoldak	3324615270	Reorganize test cases	2013-02-06 10:41:08 -05:00
Jay Zoldak	5a6b039208	Reorganize the CmsTestCase subclass	2013-02-06 10:36:28 -05:00
Jay Zoldak	2c5a7ccdf7	Rearrange factories and clean up imports	2013-02-06 10:36:28 -05:00
Jay Zoldak	b63c3c5a67	Change modulestore name and subclass TestCase	2013-02-06 10:36:28 -05:00
Chris Dodge	3fa1fe0cd6	change from throwing a Http404 exception, which I believe will try to render a static 404.html template - and ironically triggers a 500 server error. Just create a HttpResponse and set the status_code to 404.	2013-02-05 16:26:07 -05:00
Chris Dodge	ab9d30cbc6	Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-static-tabs	2013-01-31 10:51:24 -05:00
Chris Dodge	fc57e7afdb	add testing for course info export. Plus DRY things out a bit	2013-01-31 10:51:20 -05:00
Christina Roberts	54c1fe9c67	Merge pull request #1384 from MITx/fix/cdodge/export-static-tabs ... adding exporting of tabs and custom_tags. Also added unit tests	2013-01-30 10:52:31 -08:00
Chris Dodge	c676046341	adding exporting of tabs and custom_tags. Also added unit tests	2013-01-30 13:25:17 -05:00
Chris Dodge	7f32aae47d	rename method to something that actually better reflects what it is doing. Also rename a variable to help with readability	2013-01-30 11:50:11 -05:00
Chris Dodge	74fcf96611	don't hard code the ordering of the tabs in the test. Take the current ordering defintion (in the test data) and reverse it	2013-01-30 09:43:57 -05:00
Chris Dodge	855c8bb7e7	add unit test for tab reordering	2013-01-29 13:44:42 -05:00
Chris Dodge	9c3e727889	add unit test to assert that the flag is not set on course metadata	2013-01-23 15:14:36 -05:00
cahrens	65d45d6dee	Minor cleanup.	2013-01-16 09:57:21 -05:00
cahrens	07d6bee5a7	storing work	2013-01-16 09:53:28 -05:00
cahrens	9818664bb1	storing work	2013-01-15 16:04:34 -05:00
Chris Dodge	b5776a775e	add another assert test	2013-01-14 12:17:51 -05:00
Chris Dodge	edb913f6ac	add tests for about content overrides	2013-01-14 12:12:40 -05:00
chrisndodge	ee9b9d0422	Merge pull request #1249 from MITx/feature/cas/speed-editor ... Feature/cas/speed editor	2013-01-09 17:52:46 -08:00
Don Mitchell	fff9afdeb8	Minor cleanups	2013-01-09 11:38:01 -05:00
Don Mitchell	b8f530e865	Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor	2013-01-09 10:49:20 -05:00
Don Mitchell	2d8ddb0dcb	Ever slightly more rigorous test. actually look for the markdown field ... in the model as well as the ancillary info	2013-01-09 10:47:03 -05:00