test coverage and linting

Author: arrestle

ansible_base/activitystream/models/entry.py

@@ -68,7 +68,7 @@ def __str__(self):
             operation_text = self.get_operation_display()
             created_by_text = str(self.created_by) if self.created_by else "Unknown"
             return f'[{self.created}] Role assignment {operation_text.lower()} by {created_by_text}'
-        
+
         # Standard format for other entry types
         return f'[{self.created}] {self.get_operation_display()} by {self.created_by}: {self.content_type} {self.object_id}'
 

test_app/tests/rbac/test_dummy_models.py

@@ -0,0 +1,53 @@
+"""Test dummy models for optional django-ansible-base apps."""
+
+import pytest
+
+from ansible_base.rbac.models.dummy_models import DummyAuditableModel
+
+
+class TestDummyModel(DummyAuditableModel):
+    """Test model using DummyAuditableModel for testing."""
+
+    class Meta:
+        app_label = 'test_app'
+
+
+@pytest.mark.django_db
+def test_dummy_auditable_model_interface():
+    """Test that DummyAuditableModel provides expected interface without crashing."""
+    # Create test instance
+    test_obj = TestDummyModel()
+
+    # Test activity_stream_entries property
+    entries = test_obj.activity_stream_entries
+    assert entries.count() == 0, "Dummy model should return empty count"
+    assert entries.last() is None, "Dummy model should return None for last()"
+    assert list(entries) == [], "Dummy model should return empty list"
+    assert entries.all() == entries, "all() should return self"
+    assert entries.order_by('id') == entries, "order_by() should return self"
+
+    # Test class attributes
+    assert hasattr(test_obj, 'activity_stream_excluded_field_names')
+    assert test_obj.activity_stream_excluded_field_names == []
+    assert hasattr(test_obj, 'activity_stream_limit_field_names')
+    assert test_obj.activity_stream_limit_field_names == []
+
+    # Test extra_related_fields method
+    assert test_obj.extra_related_fields(None) == {}
+
+
+def test_dummy_model_prevents_import_crashes():
+    """Test that DummyAuditableModel can be imported without activitystream app."""
+    # This test verifies the import works (which it does if we got here)
+    # The real test is that importing dummy_models doesn't crash AWX/EDA
+    from ansible_base.rbac.models.dummy_models import DummyAuditableModel
+
+    # Verify it's abstract
+    assert DummyAuditableModel._meta.abstract is True
+
+    # Verify expected interface exists
+    dummy = DummyAuditableModel()
+    assert hasattr(dummy, 'activity_stream_entries')
+    assert hasattr(dummy, 'extra_related_fields')
+    assert hasattr(dummy, 'activity_stream_excluded_field_names')
+    assert hasattr(dummy, 'activity_stream_limit_field_names')

test_app/tests/rbac/test_rbac_activity_stream.py

@@ -56,13 +56,12 @@ def test_role_user_assignment_activity_stream_lifecycle(system_user, admin_user,
     assert assignment.activity_stream_entries.count() == 1
     create_entry = assignment.activity_stream_entries.last()
     verify_activity_entry_fields(create_entry, 'create', admin_user, test_user.id, role_def.id, 'user')
-    
+
     # Verify enhanced string representation
     entry_str = str(create_entry)
     assert "created" in entry_str.lower()
     assert str(admin_user) in entry_str
 
-
     # Delete assignment and verify DELETE entry
     assignment_id = assignment.id
     with impersonate(admin_user):
@@ -79,7 +78,7 @@ def test_role_user_assignment_activity_stream_lifecycle(system_user, admin_user,
     assert assignment_entries.count() == 2
     delete_entry = assignment_entries.last()
     verify_activity_entry_fields(delete_entry, 'delete', admin_user, test_user.id, role_def.id, 'user')
-    
+
     # Verify enhanced string representation for delete
     delete_str = str(delete_entry)
     assert "deleted" in delete_str.lower()
@@ -128,3 +127,21 @@ def test_role_team_assignment_activity_stream(admin_user, team, organization):
     assert assignment_entries.count() == 2
     delete_entry = assignment_entries.last()
     verify_activity_entry_fields(delete_entry, 'delete', admin_user, team.id, role_def.id, 'team')
+
+
+@pytest.mark.skipif(not apps.is_installed('ansible_base.activitystream'), reason="Activity stream tests only run when activitystream app is installed")
+@pytest.mark.django_db
+def test_non_role_assignment_entry_str_unchanged(admin_user):
+    """Test that non-role assignment entries still use standard __str__() format."""
+    from test_app.models import Organization
+
+    # Create a regular organization (not a role assignment)
+    org = Organization.objects.create(name='TestOrg_Standard')
+
+    # Get the activity entry for the organization creation
+    org_entry = org.activity_stream_entries.last()
+
+    # Verify it uses the standard format (not enhanced role assignment format)
+    entry_str = str(org_entry)
+    assert 'test_app | organization' in entry_str, "Non-role entries should use standard format"
+    assert 'Role assignment' not in entry_str, "Non-role entries should not use role assignment format"