From 5d300bf36f739db037666d62eed9e695f8ea6d31 Mon Sep 17 00:00:00 2001 From: JonahStanley Date: Thu, 11 Jul 2013 14:34:41 -0400 Subject: [PATCH] Fixed the broken unit tests from deleting full --- .../contentstore/tests/test_contentstore.py | 7 ------- common/test/data/toy/chapter/html_container.xml | 1 - common/test/data/toy/course/2012_Fall.xml | 1 - common/test/data/toy/html/toylab.html | 13 ------------- common/test/data/toy/html/toylab.xml | 1 - common/test/data/toy/vertical/vertical_test.xml | 9 --------- 6 files changed, 32 deletions(-) delete mode 100644 common/test/data/toy/chapter/html_container.xml delete mode 100644 common/test/data/toy/html/toylab.html delete mode 100644 common/test/data/toy/html/toylab.xml diff --git a/cms/djangoapps/contentstore/tests/test_contentstore.py b/cms/djangoapps/contentstore/tests/test_contentstore.py index b43ea46d7d..be122fa1a4 100644 --- a/cms/djangoapps/contentstore/tests/test_contentstore.py +++ b/cms/djangoapps/contentstore/tests/test_contentstore.py @@ -359,13 +359,6 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase): direct_store = modulestore('direct') import_from_xml(direct_store, 'common/test/data/', ['toy']) - html_module_location = Location(['i4x', 'edX', 'toy', 'html', 'toylab', None]) - - url = reverse('preview_component', kwargs={'location': html_module_location.url()}) - - resp = self.client.get(url) - self.assertEqual(resp.status_code, 200) - # also try a custom response which will trigger the 'is this course in whitelist' logic problem_module_location = Location(['i4x', 'edX', 'toy', 'vertical', 'vertical_test', None]) url = reverse('preview_component', kwargs={'location': problem_module_location.url()}) diff --git a/common/test/data/toy/chapter/html_container.xml b/common/test/data/toy/chapter/html_container.xml deleted file mode 100644 index 5691607f3b..0000000000 --- a/common/test/data/toy/chapter/html_container.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/common/test/data/toy/course/2012_Fall.xml b/common/test/data/toy/course/2012_Fall.xml index b96f04042f..ded9713f17 100644 --- a/common/test/data/toy/course/2012_Fall.xml +++ b/common/test/data/toy/course/2012_Fall.xml @@ -13,5 +13,4 @@ - diff --git a/common/test/data/toy/html/toylab.html b/common/test/data/toy/html/toylab.html deleted file mode 100644 index b2a4599cc6..0000000000 --- a/common/test/data/toy/html/toylab.html +++ /dev/null @@ -1,13 +0,0 @@ -Lab 2A: Superposition Experiment - -<<<<<<< Updated upstream -

Isn't the toy course great?

- -

Let's add some markup that uses non-ascii characters. -For example, we should be able to write words like encyclopædia, or foreign words like français. -Looking beyond latin-1, we should handle math symbols: πr² ≤ ∞. -And it shouldn't matter if we use entities or numeric codes — Ω ≠ π ≡ Ω ≠ π. -

-======= -

Isn't the toy course great? — ≤

->>>>>>> Stashed changes diff --git a/common/test/data/toy/html/toylab.xml b/common/test/data/toy/html/toylab.xml deleted file mode 100644 index ab78aeb494..0000000000 --- a/common/test/data/toy/html/toylab.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/common/test/data/toy/vertical/vertical_test.xml b/common/test/data/toy/vertical/vertical_test.xml index 72ad1692ba..e801a4ac86 100644 --- a/common/test/data/toy/vertical/vertical_test.xml +++ b/common/test/data/toy/vertical/vertical_test.xml @@ -4,13 +4,4 @@ Yes No - - Answer the question - - - - -