From c61f2ddc697bb07792e1e119053d3f4754c114cc Mon Sep 17 00:00:00 2001
From: J. Cliff Dyer <cdyer@edx.org>
Date: Wed, 17 Aug 2016 16:52:20 -0400
Subject: [PATCH] Update xblock requirement to 1.0.0.
---
cms/djangoapps/contentstore/views/tests/test_library.py | 2 +-
common/lib/xmodule/xmodule/tests/test_capa_module.py | 5 +++--
lms/djangoapps/certificates/tests/test_webview_views.py | 6 +++---
lms/djangoapps/courseware/tests/test_lti_integration.py | 2 +-
lms/djangoapps/courseware/tests/test_video_mongo.py | 18 +++++++++---------
lms/djangoapps/shoppingcart/tests/test_views.py | 6 +++---
requirements/edx/base.txt | 2 +-
7 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/cms/djangoapps/contentstore/views/tests/test_library.py b/cms/djangoapps/contentstore/views/tests/test_library.py
index e8514af..ce13da3 100644
--- a/cms/djangoapps/contentstore/views/tests/test_library.py
+++ b/cms/djangoapps/contentstore/views/tests/test_library.py
@@ -212,7 +212,7 @@ class UnitTestLibraries(CourseTestCase):
response = self.client.get(make_url_for_lib(lib.location.library_key))
self.assertEqual(response.status_code, 200)
self.assertIn("<html", response.content)
- self.assertIn(lib.display_name, response.content)
+ self.assertIn(lib.display_name.encode('utf-8'), response.content)
@ddt.data('library-v1:Nonexistent+library', 'course-v1:Org+Course', 'course-v1:Org+Course+Run', 'invalid')
def test_invalid_keys(self, key_str):
diff --git a/common/lib/xmodule/xmodule/tests/test_capa_module.py b/common/lib/xmodule/xmodule/tests/test_capa_module.py
index 18f8ee1..c32ac3d 100644
--- a/common/lib/xmodule/xmodule/tests/test_capa_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_capa_module.py
@@ -2370,7 +2370,7 @@ class CapaDescriptorTest(unittest.TestCase):
def test_indexing_checkboxes(self):
name = "Checkboxes"
descriptor = self._create_descriptor(self.sample_checkbox_problem_xml, name=name)
- capa_content = textwrap.dedent("""
+ capa_content = textwrap.dedent(u"""
Title
Description
Example
@@ -2384,7 +2384,8 @@ class CapaDescriptorTest(unittest.TestCase):
""")
self.assertEquals(descriptor.problem_types, {"choiceresponse"})
self.assertEquals(
- descriptor.index_dictionary(), {
+ descriptor.index_dictionary(),
+ {
'content_type': CapaDescriptor.INDEX_CONTENT_TYPE,
'problem_types': ["choiceresponse"],
'content': {
diff --git a/lms/djangoapps/certificates/tests/test_webview_views.py b/lms/djangoapps/certificates/tests/test_webview_views.py
index 738d573..b6f6402 100644
--- a/lms/djangoapps/certificates/tests/test_webview_views.py
+++ b/lms/djangoapps/certificates/tests/test_webview_views.py
@@ -758,14 +758,14 @@ class CertificatesViewsTests(CommonCertificatesTestCase):
CourseStaffRole(self.course.id).add_users(self.user)
response = self.client.get(test_url + '?preview=honor')
- self.assertNotIn(self.course.display_name, response.content)
+ self.assertNotIn(self.course.display_name.encode('utf-8'), response.content)
self.assertIn('course_title_0', response.content)
self.assertIn('Signatory_Title 0', response.content)
# mark certificate inactive but accessing in preview mode.
self._add_course_certificates(count=1, signatory_count=2, is_active=False)
response = self.client.get(test_url + '?preview=honor')
- self.assertNotIn(self.course.display_name, response.content)
+ self.assertNotIn(self.course.display_name.encode('utf-8'), response.content)
self.assertIn('course_title_0', response.content)
self.assertIn('Signatory_Title 0', response.content)
@@ -786,7 +786,7 @@ class CertificatesViewsTests(CommonCertificatesTestCase):
# user has already has certificate generated for 'honor' mode
# so let's try to preview in 'verified' mode.
response = self.client.get(test_url + '?preview=verified')
- self.assertNotIn(self.course.display_name, response.content)
+ self.assertNotIn(self.course.display_name.encode('utf-8'), response.content)
self.assertIn('course_title_0', response.content)
self.assertIn('Signatory_Title 0', response.content)
diff --git a/lms/djangoapps/courseware/tests/test_lti_integration.py b/lms/djangoapps/courseware/tests/test_lti_integration.py
index 70d14ec..20c69e0 100644
--- a/lms/djangoapps/courseware/tests/test_lti_integration.py
+++ b/lms/djangoapps/courseware/tests/test_lti_integration.py
@@ -78,7 +78,7 @@ class TestLTI(BaseTestXmodule):
'input_fields': self.correct_headers,
'element_class': self.item_descriptor.category,
'element_id': self.item_descriptor.location.html_id(),
- 'launch_url': 'http://www.example.com', # default value
+ 'launch_url': u'http://www.example.com', # default value
'open_in_a_new_page': True,
'form_url': self.item_descriptor.xmodule_runtime.handler_url(self.item_descriptor,
'preview_handler').rstrip('/?'),
diff --git a/lms/djangoapps/courseware/tests/test_video_mongo.py b/lms/djangoapps/courseware/tests/test_video_mongo.py
index 72bd14e..33fda8c 100644
--- a/lms/djangoapps/courseware/tests/test_video_mongo.py
+++ b/lms/djangoapps/courseware/tests/test_video_mongo.py
@@ -83,7 +83,7 @@ class TestVideoYouTube(TestVideo):
"recordedYoutubeIsAvailable": True,
})),
'track': None,
- 'transcript_download_format': 'srt',
+ 'transcript_download_format': u'srt',
'transcript_download_formats_list': [
{'display_name': 'SubRip (.srt) file', 'value': 'srt'},
{'display_name': 'Text (.txt) file', 'value': 'txt'}
@@ -162,7 +162,7 @@ class TestVideoNonYouTube(TestVideo):
"recordedYoutubeIsAvailable": True,
})),
'track': None,
- 'transcript_download_format': 'srt',
+ 'transcript_download_format': u'srt',
'transcript_download_formats_list': [
{'display_name': 'SubRip (.srt) file', 'value': 'srt'},
{'display_name': 'Text (.txt) file', 'value': 'txt'}
@@ -283,7 +283,7 @@ class TestGetHtmlMethod(BaseTestXmodule):
'id': self.item_descriptor.location.html_id(),
'metadata': '',
'track': None,
- 'transcript_download_format': 'srt',
+ 'transcript_download_format': u'srt',
'transcript_download_formats_list': [
{'display_name': 'SubRip (.srt) file', 'value': 'srt'},
{'display_name': 'Text (.txt) file', 'value': 'txt'}
@@ -321,7 +321,7 @@ class TestGetHtmlMethod(BaseTestXmodule):
})
expected_context.update({
'transcript_download_format': (
- None if self.item_descriptor.track and self.item_descriptor.download_track else 'srt'
+ None if self.item_descriptor.track and self.item_descriptor.download_track else u'srt'
),
'track': (
track_url if data['expected_track_url'] == u'a_sub_file.srt.sjson' else data['expected_track_url']
@@ -405,7 +405,7 @@ class TestGetHtmlMethod(BaseTestXmodule):
'id': self.item_descriptor.location.html_id(),
'metadata': self.default_metadata_dict,
'track': None,
- 'transcript_download_format': 'srt',
+ 'transcript_download_format': u'srt',
'transcript_download_formats_list': [
{'display_name': 'SubRip (.srt) file', 'value': 'srt'},
{'display_name': 'Text (.txt) file', 'value': 'txt'}
@@ -528,7 +528,7 @@ class TestGetHtmlMethod(BaseTestXmodule):
'handout': None,
'id': self.item_descriptor.location.html_id(),
'track': None,
- 'transcript_download_format': 'srt',
+ 'transcript_download_format': u'srt',
'transcript_download_formats_list': [
{'display_name': 'SubRip (.srt) file', 'value': 'srt'},
{'display_name': 'Text (.txt) file', 'value': 'txt'}
@@ -702,7 +702,7 @@ class TestGetHtmlMethod(BaseTestXmodule):
'handout': None,
'id': self.item_descriptor.location.html_id(),
'track': None,
- 'transcript_download_format': 'srt',
+ 'transcript_download_format': u'srt',
'transcript_download_formats_list': [
{'display_name': 'SubRip (.srt) file', 'value': 'srt'},
{'display_name': 'Text (.txt) file', 'value': 'txt'}
@@ -816,7 +816,7 @@ class TestGetHtmlMethod(BaseTestXmodule):
'id': None,
'metadata': self.default_metadata_dict,
'track': None,
- 'transcript_download_format': 'srt',
+ 'transcript_download_format': u'srt',
'transcript_download_formats_list': [
{'display_name': 'SubRip (.srt) file', 'value': 'srt'},
{'display_name': 'Text (.txt) file', 'value': 'txt'}
@@ -1531,7 +1531,7 @@ class TestVideoWithBumper(TestVideo):
"recordedYoutubeIsAvailable": True,
})),
'track': None,
- 'transcript_download_format': 'srt',
+ 'transcript_download_format': u'srt',
'transcript_download_formats_list': [
{'display_name': 'SubRip (.srt) file', 'value': 'srt'},
{'display_name': 'Text (.txt) file', 'value': 'txt'}
diff --git a/lms/djangoapps/shoppingcart/tests/test_views.py b/lms/djangoapps/shoppingcart/tests/test_views.py
index 03d64db..dbe64eb 100644
--- a/lms/djangoapps/shoppingcart/tests/test_views.py
+++ b/lms/djangoapps/shoppingcart/tests/test_views.py
@@ -481,7 +481,7 @@ class ShoppingCartViewsTests(SharedModuleStoreTestCase, XssTestMixin):
self.add_course_to_user_cart(self.course_key)
resp = self.client.post(reverse('register_code_redemption', args=[self.reg_code]), HTTP_HOST='localhost')
self.assertEqual(resp.status_code, 200)
- self.assertIn(self.course.display_name, resp.content)
+ self.assertIn(self.course.display_name.encode('utf-8'), resp.content)
@ddt.data(True, False)
def test_reg_code_uses_unknown_mode(self, expired_mode):
@@ -493,7 +493,7 @@ class ShoppingCartViewsTests(SharedModuleStoreTestCase, XssTestMixin):
self.add_course_to_user_cart(self.course_key)
resp = self.client.post(reverse('register_code_redemption', args=[self.reg_code]), HTTP_HOST='localhost')
self.assertEqual(resp.status_code, 200)
- self.assertIn(self.course.display_name, resp.content)
+ self.assertIn(self.course.display_name.encode('utf-8'), resp.content)
self.assertIn("error processing your redeem code", resp.content)
def test_course_discount_for_valid_active_coupon_code(self):
@@ -1836,7 +1836,7 @@ class RegistrationCodeRedemptionCourseEnrollment(SharedModuleStoreTestCase):
dashboard_url = reverse('dashboard')
response = self.client.get(dashboard_url)
self.assertEquals(response.status_code, 200)
- self.assertIn(self.course.display_name, response.content)
+ self.assertIn(self.course.display_name.encode('utf-8'), response.content)
@ddt.ddt
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 3a1a13b..19f5938 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -211,7 +211,7 @@ py2neo==3.1.2
# Support for plugins
web-fragments==0.2.2
-xblock==0.5.0
+xblock==1.0.0
# Third Party XBlocks
edx-sga==0.6.2
--
libgit2 0.26.0