mirror of
https://github.com/ansible/awx.git
synced 2026-11-22 16:26:10 -03:30
Merge branch 'devel' into migration
This commit is contained in:
@@ -20,7 +20,7 @@ def test_get_activity_stream_list(monkeypatch, organization, get, user):
|
||||
@pytest.mark.django_db
|
||||
def test_basic_fields(monkeypatch, organization, get, user):
|
||||
u = user('admin', True)
|
||||
activity_stream = ActivityStream.objects.latest('pk')
|
||||
activity_stream = ActivityStream.objects.filter(organization=organization).latest('pk')
|
||||
activity_stream.actor = u
|
||||
activity_stream.save()
|
||||
|
||||
|
||||
@@ -15,6 +15,7 @@ def test_custom_inv_script_access(organization, user):
|
||||
|
||||
custom_inv = CustomInventoryScript.objects.create(name='test', script='test', description='test')
|
||||
custom_inv.organization = organization
|
||||
custom_inv.save()
|
||||
assert not custom_inv.accessible_by(u, {'read':True})
|
||||
|
||||
organization.member_role.members.add(u)
|
||||
|
||||
Reference in New Issue
Block a user