Changes in ow/tests/models/test_workout.py [78af3d1:c9991fed] in OpenWorkouts-current

File:

• ow/tests/models/test_workout.py (modified) (2 diffs)

ow/tests/models/test_workout.py

@@ -6 +6 @@
 
 import pytest
-from pyramid.security import Allow, Everyone, Deny, ALL_PERMISSIONS
+from pyramid.security import Allow, Everyone
 
 from ow.models.workout import Workout
@@ -33 +33 @@
     def test__acl__(self, root):
         # First check permissions for a workout without parent
-        workout = Workout()
-        with pytest.raises(AttributeError):
-            workout.__acl__()
+        permissions = [(Allow, Everyone, 'view'),
+                       (Allow, 'group:admins', 'edit')]
+        workout = Workout()
+        assert workout.__acl__() == permissions
+
         # Now permissions on a workout that has been added to a user
         uid = str(root['john'].uid)
-        workout = root['john']['1']
-        permissions = [
-            (Allow, uid, 'view'),
-            (Allow, uid, 'edit'),
-            (Allow, uid, 'delete'),
-            (Deny, Everyone, ALL_PERMISSIONS)
-        ]
-        assert workout.__acl__() == permissions
+        permissions = [(Allow, uid, 'view'), (Allow, uid, 'edit')]
+        assert root['john']['1'].__acl__() == permissions
 
     def test_runthrough(self, root):