Commit e9f2f626 by cahrens

Change to work with split modulestore.

make_asset_key does not start with "/" for split locators.
parent 7a3a48b1
...@@ -168,28 +168,38 @@ class ExtraPanelTabTestCase(TestCase): ...@@ -168,28 +168,38 @@ class ExtraPanelTabTestCase(TestCase):
class CourseImageTestCase(ModuleStoreTestCase): class CourseImageTestCase(ModuleStoreTestCase):
"""Tests for course image URLs.""" """Tests for course image URLs."""
def verify_url(self, expected_url, actual_url):
"""
Helper method for verifying the URL is as expected.
"""
if not expected_url.startswith("/"):
expected_url = "/" + expected_url
self.assertEquals(expected_url, actual_url)
def test_get_image_url(self): def test_get_image_url(self):
"""Test image URL formatting.""" """Test image URL formatting."""
course = CourseFactory.create() course = CourseFactory.create()
url = utils.course_image_url(course) self.verify_url(
self.assertEquals(url, unicode(course.id.make_asset_key('asset', course.course_image))) unicode(course.id.make_asset_key('asset', course.course_image)),
utils.course_image_url(course)
)
def test_non_ascii_image_name(self): def test_non_ascii_image_name(self):
""" Verify that non-ascii image names are cleaned """ """ Verify that non-ascii image names are cleaned """
course_image = u'before_\N{SNOWMAN}_after.jpg' course_image = u'before_\N{SNOWMAN}_after.jpg'
course = CourseFactory.create(course_image=course_image) course = CourseFactory.create(course_image=course_image)
self.assertEquals( self.verify_url(
utils.course_image_url(course), unicode(course.id.make_asset_key('asset', course_image.replace(u'\N{SNOWMAN}', '_'))),
unicode(course.id.make_asset_key('asset', course_image.replace(u'\N{SNOWMAN}', '_'))) utils.course_image_url(course)
) )
def test_spaces_in_image_name(self): def test_spaces_in_image_name(self):
""" Verify that image names with spaces in them are cleaned """ """ Verify that image names with spaces in them are cleaned """
course_image = u'before after.jpg' course_image = u'before after.jpg'
course = CourseFactory.create(course_image=u'before after.jpg') course = CourseFactory.create(course_image=u'before after.jpg')
self.assertEquals( self.verify_url(
utils.course_image_url(course), unicode(course.id.make_asset_key('asset', course_image.replace(" ", "_"))),
unicode(course.id.make_asset_key('asset', course_image.replace(" ", "_"))) utils.course_image_url(course)
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment