Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,222 Commits 1 Branch 0 Tags
f2a495bfebe19081285dd1e71eefd766d62799e2
Commit Graph

124 Commits

Author SHA1 Message Date
Chris Dodge
9ba759802c make export a bit more resilient. If there's a piece of metadata that we can't serialize - i.e. someone wrote a new bool attribute and didn't put it in the type mapping table - then we log the exception and continue. 2013-03-07 10:43:36 -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
Will Daly
2436d59e14 Merge branch 'master' into feature/deena/testing 
Conflicts:
	cms/djangoapps/contentstore/tests/factories.py
	lms/djangoapps/courseware/tests/test_access.py
 2013-03-04 16:30:41 -05:00
Chris Dodge
3f9bc86c9e need to pass commit parameter 2013-03-02 21:26:24 -05:00
Chris Dodge
bcea53d4b7 do the metadata comparison on the parent not the course as we don't actually know which vertical we ended up picking (could be arbitrary). 2013-03-02 19:36:11 -05:00
Carlos Andrés Rocha
2ca303c95d Merge pull request #1526 from MITx/feature/cas/manual-policy-merged 
Feature/cas/manual policy merged
 2013-02-27 09:02:07 -08:00
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
Brian Talbot
7b60ec380a Merge branch 'master' into feature/cas/manual-policy-merged 2013-02-20 14:58:50 -05:00
Jay Zoldak
8c423da6db Updated test to reflect new class name for course titles. 2013-02-19 13:50:40 -05:00
cahrens
f91060d197 Merge branch 'master' into feature/cas/manual-policy 
Conflicts:
	cms/djangoapps/contentstore/features/common.py
	cms/djangoapps/contentstore/features/section.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/settings/course_grading_policy.js
	cms/static/js/views/settings/main_settings_view.js
	cms/static/sass/_settings.scss
	cms/templates/settings.html
	cms/urls.py
 2013-02-19 13:27:35 -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
cahrens
b49325009a Merge branch 'master' into feature/btalbot/studio-softlanding 2013-02-15 13:14:46 -05:00
Christina Roberts
dceb8fee5e Merge pull request #1494 from MITx/feature/marco/addcomponent 
Feature/marco/addcomponent
 2013-02-15 10:13:24 -08:00
Don Mitchell
c4586edb2e Change hardcoded template names to the newer hardcoded template names 
:-(
 2013-02-15 12:03:04 -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
Don Mitchell
253bc10d9f did other test cleanups which Christina mentioned (should have read the 
note first)
 2013-02-06 17:31:17 -05:00
Don Mitchell
7668c70f62 Update test now updates existing attrs 2013-02-06 17:01:00 -05:00
Don Mitchell
8f18522d58 Unit tests for edit metadata 2013-02-06 12:01:22 -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
Deena Wang
1a6fc1b505 Merge branch 'feature/deena/testing' of https://github.com/MITx/mitx into feature/deena/testing 
Conflicts:
	cms/djangoapps/contentstore/tests/test_views.py
 2013-02-01 16:05:44 -05:00
Deena Wang
c144b2519a more tests in test_views.py 2013-02-01 15:57:11 -05:00
Deena Wang
25aca5866d Merge branch 'master' into feature/deena/testing 
Conflicts:
	lms/djangoapps/courseware/tests/test_access.py
 2013-02-01 10:19:40 -05:00