-
Notifications
You must be signed in to change notification settings - Fork 4.3k
refactor: update to work with latest openedx_content container changes [FC-0117] #38181
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
bradenmacdonald
wants to merge
1
commit into
openedx:master
Choose a base branch
from
open-craft:braden/container-types-refactor
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+166
−346
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,6 +9,7 @@ | |
| from unittest.mock import MagicMock, Mock, call, patch | ||
| from opaque_keys.edx.keys import UsageKey | ||
| from opaque_keys.edx.locator import LibraryCollectionLocator, LibraryContainerLocator | ||
| from openedx_content import models_api as content_models | ||
|
|
||
| import ddt | ||
| import pytest | ||
|
|
@@ -224,15 +225,15 @@ def setUp(self) -> None: | |
| with freeze_time(self.created_date): | ||
| self.unit = library_api.create_container( | ||
| library_key=self.library.key, | ||
| container_type=library_api.ContainerType.Unit, | ||
| container_type=content_models.Unit, | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think that either the pararm |
||
| slug="unit-1", | ||
| title="Unit 1", | ||
| user_id=None, | ||
| ) | ||
| self.unit_key = "lct:org1:lib:unit:unit-1" | ||
| self.subsection = library_api.create_container( | ||
| self.library.key, | ||
| container_type=library_api.ContainerType.Subsection, | ||
| container_type=content_models.Subsection, | ||
| slug="subsection-1", | ||
| title="Subsection 1", | ||
| user_id=None, | ||
|
|
@@ -245,7 +246,7 @@ def setUp(self) -> None: | |
| self.subsection_key = "lct:org1:lib:subsection:subsection-1" | ||
| self.section = library_api.create_container( | ||
| self.library.key, | ||
| container_type=library_api.ContainerType.Section, | ||
| container_type=content_models.Section, | ||
| slug="section-1", | ||
| title="Section 1", | ||
| user_id=None, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What do you think about learning towards
<ContainerSubclass>.type_codeas the canonical way to check type codes?I think, in general, we could lean away from the olx tags except for when we really need them (serialization/deserialization). Especially since the ContainerKeys don't even use those olx codes.