Merge branch 'devel' into migration

This commit is contained in:
Akita Noek
2016-04-12 15:12:43 -04:00
6 changed files with 47 additions and 31 deletions
@@ -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)