From 0c6991822b89c8e1c17c8b956725e61310bc7a4d Mon Sep 17 00:00:00 2001 From: Chris Dodge Date: Mon, 10 Jun 2013 12:46:03 -0400 Subject: [PATCH] move test so it doesn't split the tests from a helper method --- .../contentstore/tests/test_contentstore.py | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/cms/djangoapps/contentstore/tests/test_contentstore.py b/cms/djangoapps/contentstore/tests/test_contentstore.py index a6b4d1f57c..92bed5e187 100644 --- a/cms/djangoapps/contentstore/tests/test_contentstore.py +++ b/cms/djangoapps/contentstore/tests/test_contentstore.py @@ -108,17 +108,6 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase): for expected in expected_types: self.assertIn(expected, resp.content) - def test_malformed_edit_unit_request(self): - store = modulestore('direct') - import_from_xml(store, 'common/test/data/', ['simple']) - - # just pick one vertical - descriptor = store.get_items(Location('i4x', 'edX', 'simple', 'vertical', None, None))[0] - location = descriptor.location._replace(name='.' + descriptor.location.name) - - resp = self.client.get(reverse('edit_unit', kwargs={'location': location.url()})) - self.assertEqual(resp.status_code, 400) - def test_advanced_components_in_edit_unit(self): # This could be made better, but for now let's just assert that we see the advanced modules mentioned in the page # response HTML @@ -131,6 +120,17 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase): def test_advanced_components_require_two_clicks(self): self.check_components_on_page(['videoalpha'], ['Video Alpha']) + def test_malformed_edit_unit_request(self): + store = modulestore('direct') + import_from_xml(store, 'common/test/data/', ['simple']) + + # just pick one vertical + descriptor = store.get_items(Location('i4x', 'edX', 'simple', 'vertical', None, None))[0] + location = descriptor.location._replace(name='.' + descriptor.location.name) + + resp = self.client.get(reverse('edit_unit', kwargs={'location': location.url()})) + self.assertEqual(resp.status_code, 400) + def check_edit_unit(self, test_course_name): import_from_xml(modulestore('direct'), 'common/test/data/', [test_course_name])