Fix issues with overrides on duplicated RCBs.

cms/djangoapps/contentstore/tests/test_libraries.py

@@ -3,6 +3,7 @@ Content library unit tests that require the CMS runtime.
 """
 from contentstore.tests.utils import AjaxEnabledTestClient, parse_json
 from contentstore.utils import reverse_url, reverse_usage_url, reverse_library_url
+from contentstore.views.item import _duplicate_item
 from contentstore.views.preview import _load_preview_module
 from contentstore.views.tests.test_library import LIBRARY_REST_URL
 import ddt
@@ -726,6 +727,7 @@ class TestLibraryAccess(SignalDisconnectTestMixin, LibraryTestCase):
         self.assertEqual(len(lc_block.children), 1 if expected_result else 0)
 
 
+@ddt.ddt
 class TestOverrides(LibraryTestCase):
     """
     Test that overriding block Scope.settings fields from a library in a specific course works
@@ -822,7 +824,8 @@ class TestOverrides(LibraryTestCase):
         self.assertEqual(self.problem.definition_locator.definition_id, definition_id)
         self.assertEqual(self.problem_in_course.definition_locator.definition_id, definition_id)
 
-    def test_persistent_overrides(self):
+    @ddt.data(False, True)
+    def test_persistent_overrides(self, duplicate):
         """
         Test that when we override Scope.settings values in a course,
         the override values persist even when the block is refreshed
@@ -834,7 +837,14 @@ class TestOverrides(LibraryTestCase):
         self.problem_in_course.weight = new_weight
 
         modulestore().update_item(self.problem_in_course, self.user.id)
-        self.problem_in_course = modulestore().get_item(self.problem_in_course.location)
+        if duplicate:
+            # Check that this also works when the RCB is duplicated.
+            self.lc_block = modulestore().get_item(
+                _duplicate_item(self.course.location, self.lc_block.location, self.user)
+            )
+            self.problem_in_course = modulestore().get_item(self.lc_block.children[0])
+        else:
+            self.problem_in_course = modulestore().get_item(self.problem_in_course.location)
         self.assertEqual(self.problem_in_course.display_name, new_display_name)
         self.assertEqual(self.problem_in_course.weight, new_weight)