fix: fix tests after rebase

Author: NiedielnitsevIvan

cms/djangoapps/import_from_modulestore/tests/test_helpers.py

@@ -7,6 +7,7 @@
 from unittest.mock import patch
 
 from lxml import etree
+from openedx_learning.api.authoring_models import LearningPackage
 
 from cms.djangoapps.import_from_modulestore import api
 from cms.djangoapps.import_from_modulestore.helpers import ImportClient
@@ -51,7 +52,7 @@ def setUp(self):
         with self.captureOnCommitCallbacks(execute=True):
             self.import_event = api.create_import(
                 source_key=self.course.id,
-                learning_package_id=self.library.learning_package.id,
+                learning_package_id=self.library.learning_package_id,
                 user_id=self.user.id,
             )
         self.parser = etree.XMLParser(strip_cdata=False)
@@ -69,7 +70,8 @@ def test_import_from_staged_content(self):
 
         import_client.import_from_staged_content()
 
-        self.assertEqual(self.library.learning_package.content_set.count(), len(expected_imported_xblocks))
+        learning_package = LearningPackage.objects.get(id=self.library.learning_package_id)
+        self.assertEqual(learning_package.content_set.count(), len(expected_imported_xblocks))
 
     @patch('cms.djangoapps.import_from_modulestore.helpers.ImportClient._process_import')
     def test_import_from_staged_content_block_not_found(self, mocked_process_import):
@@ -84,7 +86,8 @@ def test_import_from_staged_content_block_not_found(self, mocked_process_import)
 
         import_client.import_from_staged_content()
 
-        self.assertTrue(not self.library.learning_package.content_set.count())
+        library_learning_package = LearningPackage.objects.get(id=self.library.learning_package_id)
+        self.assertTrue(not library_learning_package.content_set.count())
         mocked_process_import.assert_not_called()
 
     @ddt.data('chapter', 'sequential', 'vertical')
@@ -105,7 +108,8 @@ def test_create_container(self, block_lvl):
             container_to_import.display_name
         )
 
-        self.assertEqual(self.library.learning_package.publishable_entities.count(), 1)
+        library_learning_package = LearningPackage.objects.get(id=self.library.learning_package_id)
+        self.assertEqual(library_learning_package.publishable_entities.count(), 1)
 
     def test_create_container_with_xblock(self):
         block_usage_id_to_import = str(self.problem.location)
@@ -142,7 +146,8 @@ def test_process_import_with_complicated_blocks(self, block_lvl):
         # pylint: disable=protected-access
         result = import_client._process_import(block_usage_id_to_import, block_to_import)
 
-        self.assertEqual(self.library.learning_package.content_set.count(), len(expected_imported_xblocks))
+        library_learning_package = LearningPackage.objects.get(id=self.library.learning_package_id)
+        self.assertEqual(library_learning_package.content_set.count(), len(expected_imported_xblocks))
         self.assertEqual(len(result), len(expected_imported_xblocks))
         self.assertEqual(self.import_event.publishableentityimport_set.count(), len(expected_imported_xblocks))
 
@@ -164,7 +169,8 @@ def test_process_import_with_simple_blocks(self, block_type_to_import):
         # pylint: disable=protected-access
         result = import_client._process_import(block_usage_id_to_import, block_to_import)
 
-        self.assertEqual(self.library.learning_package.content_set.count(), len(expected_imported_xblocks))
+        library_learning_package = LearningPackage.objects.get(id=self.library.learning_package_id)
+        self.assertEqual(library_learning_package.content_set.count(), len(expected_imported_xblocks))
         self.assertEqual(len(result), len(expected_imported_xblocks))
         self.assertEqual(self.import_event.publishableentityimport_set.count(), len(expected_imported_xblocks))
 
@@ -190,7 +196,7 @@ def test_process_import_with_override(self, override):
         with self.captureOnCommitCallbacks(execute=True):
             new_import_event = api.create_import(
                 source_key=self.course.id,
-                learning_package_id=self.library.learning_package.id,
+                learning_package_id=self.library.learning_package_id,
                 user_id=self.user.id,
             )
         new_staged_content = new_import_event.get_staged_content_by_block_usage_id(block_usage_id_to_import)

cms/djangoapps/import_from_modulestore/tests/test_tasks.py

@@ -2,6 +2,7 @@
 Tests for tasks in import_from_modulestore app.
 """
 from organizations.models import Organization
+from openedx_learning.api.authoring_models import LearningPackage
 from unittest.mock import patch
 
 from cms.djangoapps.import_from_modulestore.data import ImportStatus
@@ -90,11 +91,13 @@ class TestImportLibraryFromStagedContentTask(ImportCourseToLibraryMixin):
     """
 
     def _is_imported(self, library, xblock):
-        self.assertTrue(library.learning_package.content_set.filter(text__icontains=xblock.display_name).exists())
+        library_learning_package = LearningPackage.objects.get(id=library.learning_package_id)
+        self.assertTrue(library_learning_package.content_set.filter(text__icontains=xblock.display_name).exists())
 
     def test_import_course_staged_content_to_library_task(self):
         """ End-to-end test for import_course_staged_content_to_library_task. """
-        self.assertEqual(self.library.learning_package.content_set.count(), 0)
+        library_learning_package = LearningPackage.objects.get(id=self.library.learning_package_id)
+        self.assertEqual(library_learning_package.content_set.count(), 0)
         expected_imported_xblocks = [self.problem, self.problem2, self.video, self.video2]
         save_legacy_content_to_staged_content_task(self.import_event.uuid)
 
@@ -111,7 +114,9 @@ def test_import_course_staged_content_to_library_task(self):
 
         for xblock in expected_imported_xblocks:
             self._is_imported(self.library, xblock)
-        self.assertEqual(self.library.learning_package.content_set.count(), len(expected_imported_xblocks))
+
+        library_learning_package.refresh_from_db()
+        self.assertEqual(library_learning_package.content_set.count(), len(expected_imported_xblocks))
 
     @patch('cms.djangoapps.import_from_modulestore.tasks.ImportClient')
     def test_import_library_block_not_found(self, mock_import_client):
@@ -151,7 +156,9 @@ def test_cannot_import_staged_content_twice(self):
 
         for xblock in expected_imported_xblocks:
             self._is_imported(self.library, xblock)
-        self.assertEqual(self.library.learning_package.content_set.count(), len(expected_imported_xblocks))
+
+        library_learning_package = LearningPackage.objects.get(id=self.library.learning_package_id)
+        self.assertEqual(library_learning_package.content_set.count(), len(expected_imported_xblocks))
 
         self.import_event.refresh_from_db()
         self.assertEqual(self.import_event.status, ImportStatus.IMPORTED)

cms/djangoapps/import_from_modulestore/views/v0/tests/test_views.py

@@ -47,7 +47,7 @@ def setUp(self):
         with self.captureOnCommitCallbacks(execute=True):
             self.import_event = api.create_import(
                 user_id=self.admin_user.pk,
-                learning_package_id=self.library.learning_package.id,
+                learning_package_id=self.library.learning_package_id,
                 source_key=self.course.id,
             )