Skip to content

Commit 1a79fa9

Browse files
refactor: fix testing issues after rebase
1 parent fa12139 commit 1a79fa9

3 files changed

Lines changed: 9 additions & 19 deletions

File tree

openedx_authz/handlers.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,14 @@
1313
from django.conf import settings
1414
from django.db.models.signals import post_delete, post_save
1515
from django.dispatch import receiver
16-
from waffle.models import Flag
17-
1816
from openedx_events.authz.signals import ROLE_ASSIGNMENT_CREATED, ROLE_ASSIGNMENT_DELETED
17+
from waffle.models import Flag
1918

2019
from openedx_authz.api.users import unassign_all_roles_from_user
2120
from openedx_authz.engine.utils import run_course_authoring_migration
2221
from openedx_authz.models.authz_migration import MigrationType, ScopeType
23-
from openedx_authz.models.core import ExtendedCasbinRule
24-
from openedx_authz.models.subjects import UserSubject
25-
from openedx_authz.api.users import unassign_all_roles_from_user
2622
from openedx_authz.models.core import ExtendedCasbinRule, RoleAssignmentAudit
23+
from openedx_authz.models.subjects import UserSubject
2724

2825
try:
2926
from common.djangoapps.student.models import CourseAccessRole

openedx_authz/migrations/0008_roleassignmentaudit.py renamed to openedx_authz/migrations/0009_roleassignmentaudit.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# Generated by Django 4.2.24 on 2026-04-20 15:54
1+
# Generated by Django 5.2.13 on 2026-04-22 17:58
22

33
from django.db import migrations, models
44

55

66
class Migration(migrations.Migration):
77

88
dependencies = [
9-
("openedx_authz", "0007_coursescope"),
9+
("openedx_authz", "0008_authzcourseauthoringmigrationrun"),
1010
]
1111

1212
operations = [

openedx_authz/tests/test_handlers.py

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,31 @@
77
waffle models are not imported in the test environment).
88
"""
99

10+
from datetime import datetime, timezone
1011
from types import SimpleNamespace
11-
from unittest.mock import patch
12+
from unittest.mock import MagicMock, patch
1213

1314
from casbin_adapter.models import CasbinRule
1415
from ddt import data, ddt, unpack
1516
from django.test import TestCase, override_settings
17+
from openedx_events.authz.data import RoleAssignmentData
1618

1719
from openedx_authz.handlers import (
1820
WAFFLE_OVERRIDE_FORCE_OFF,
1921
WAFFLE_OVERRIDE_FORCE_ON,
22+
create_audit_record_on_role_assignment_change,
2023
get_migration_type,
2124
trigger_course_authoring_migration,
2225
)
2326
from openedx_authz.models.authz_migration import MigrationType, ScopeType
24-
from openedx_authz.models.core import ExtendedCasbinRule, Scope, Subject
27+
from openedx_authz.models.core import ExtendedCasbinRule, RoleAssignmentAudit, Scope, Subject
2528
from openedx_authz.models.subjects import UserSubject
2629
from openedx_authz.tests.stubs.models import (
2730
CourseAccessRole,
2831
WaffleFlagCourseOverrideModel,
2932
WaffleFlagOrgOverrideModel,
3033
)
3134

32-
from datetime import datetime, timezone
33-
from unittest.mock import MagicMock, patch
34-
35-
from casbin_adapter.models import CasbinRule
36-
from django.test import TestCase
37-
from openedx_events.authz.data import RoleAssignmentData
38-
39-
from openedx_authz.handlers import create_audit_record_on_role_assignment_change
40-
from openedx_authz.models.core import ExtendedCasbinRule, RoleAssignmentAudit, Scope, Subject
41-
4235
AUTHZ_COURSE_AUTHORING_FLAG_NAME = "authz.enable_course_authoring"
4336
OTHER_WAFFLE_FLAG_NAME = "some.other.flag"
4437

0 commit comments

Comments
 (0)