|
@@ -352,30 +352,30 @@ class TestContentApi(BaseTest, TestStandard):
|
352
|
352
|
groups = [GroupApi(None).get_one(Group.TIM_USER),
|
353
|
353
|
GroupApi(None).get_one(Group.TIM_MANAGER),
|
354
|
354
|
GroupApi(None).get_one(Group.TIM_ADMIN)]
|
355
|
|
- userA = uapi.create_user(email='this.is@user',
|
|
355
|
+ user_a = uapi.create_user(email='this.is@user',
|
356
|
356
|
groups=groups, save_now=True)
|
357
|
|
- userB = uapi.create_user(email='this.is@another.user',
|
|
357
|
+ user_b = uapi.create_user(email='this.is@another.user',
|
358
|
358
|
groups=groups, save_now=True)
|
359
|
359
|
|
360
|
|
- wapi = WorkspaceApi(userA)
|
|
360
|
+ wapi = WorkspaceApi(user_a)
|
361
|
361
|
workspace = wapi.create_workspace(
|
362
|
362
|
'test workspace',
|
363
|
363
|
save_now=True)
|
364
|
364
|
|
365
|
|
- role_api = RoleApi(userA)
|
366
|
|
- role_api.create_one(userB, workspace, UserRoleInWorkspace.READER, False)
|
367
|
|
- contapiA = ContentApi(userA)
|
368
|
|
- contapiB = ContentApi(userB)
|
|
365
|
+ role_api = RoleApi(user_a)
|
|
366
|
+ role_api.create_one(user_b, workspace, UserRoleInWorkspace.READER, False)
|
|
367
|
+ cont_api_a = ContentApi(user_a)
|
|
368
|
+ cont_api_b = ContentApi(user_b)
|
369
|
369
|
|
370
|
|
- page1 = contapiA.create(ContentType.Page, workspace, None, "this is a page", do_save=True)
|
|
370
|
+ page_1 = cont_api_a.create(ContentType.Page, workspace, None, "this is a page", do_save=True)
|
371
|
371
|
|
372
|
|
- for rev in page1.revisions:
|
373
|
|
- eq_(userB not in rev.read_by.keys(), True)
|
|
372
|
+ for rev in page_1.revisions:
|
|
373
|
+ eq_(user_b not in rev.read_by.keys(), True)
|
374
|
374
|
|
375
|
|
- contapiB.mark_read(page1)
|
|
375
|
+ cont_api_b.mark_read(page_1)
|
376
|
376
|
|
377
|
|
- for rev in page1.revisions:
|
378
|
|
- eq_(userB in rev.read_by.keys(), True)
|
|
377
|
+ for rev in page_1.revisions:
|
|
378
|
+ eq_(user_b in rev.read_by.keys(), True)
|
379
|
379
|
|
380
|
380
|
|
381
|
381
|
def test_mark_read__all(self):
|
|
@@ -383,44 +383,44 @@ class TestContentApi(BaseTest, TestStandard):
|
383
|
383
|
groups = [GroupApi(None).get_one(Group.TIM_USER),
|
384
|
384
|
GroupApi(None).get_one(Group.TIM_MANAGER),
|
385
|
385
|
GroupApi(None).get_one(Group.TIM_ADMIN)]
|
386
|
|
- userA = uapi.create_user(email='this.is@user',
|
|
386
|
+ user_a = uapi.create_user(email='this.is@user',
|
387
|
387
|
groups=groups, save_now=True)
|
388
|
|
- userB = uapi.create_user(email='this.is@another.user',
|
|
388
|
+ user_b = uapi.create_user(email='this.is@another.user',
|
389
|
389
|
groups=groups, save_now=True)
|
390
|
390
|
|
391
|
|
- wapi = WorkspaceApi(userA)
|
|
391
|
+ wapi = WorkspaceApi(user_a)
|
392
|
392
|
workspace = wapi.create_workspace(
|
393
|
393
|
'test workspace',
|
394
|
394
|
save_now=True)
|
395
|
395
|
|
396
|
|
- role_api = RoleApi(userA)
|
397
|
|
- role_api.create_one(userB, workspace, UserRoleInWorkspace.READER, False)
|
398
|
|
- contapiA = ContentApi(userA)
|
399
|
|
- contapiB = ContentApi(userB)
|
400
|
|
-
|
401
|
|
- page2 = contapiA.create(ContentType.Page, workspace, None, "this is page1", do_save=True)
|
402
|
|
- page3 = contapiA.create(ContentType.Thread, workspace, None, "this is page2", do_save=True)
|
403
|
|
- page4 = contapiA.create(ContentType.File, workspace, None, "this is page3", do_save=True)
|
404
|
|
-
|
405
|
|
- for rev in page2.revisions:
|
406
|
|
- eq_(userB not in rev.read_by.keys(), True)
|
407
|
|
- for rev in page3.revisions:
|
408
|
|
- eq_(userB not in rev.read_by.keys(), True)
|
409
|
|
- for rev in page4.revisions:
|
410
|
|
- eq_(userB not in rev.read_by.keys(), True)
|
411
|
|
-
|
412
|
|
- DBSession.refresh(page2)
|
413
|
|
- DBSession.refresh(page3)
|
414
|
|
- DBSession.refresh(page4)
|
415
|
|
-
|
416
|
|
- contapiB.mark_read__all()
|
417
|
|
-
|
418
|
|
- for rev in page2.revisions:
|
419
|
|
- eq_(userB in rev.read_by.keys(), True)
|
420
|
|
- for rev in page3.revisions:
|
421
|
|
- eq_(userB in rev.read_by.keys(), True)
|
422
|
|
- for rev in page4.revisions:
|
423
|
|
- eq_(userB in rev.read_by.keys(), True)
|
|
396
|
+ role_api = RoleApi(user_a)
|
|
397
|
+ role_api.create_one(user_b, workspace, UserRoleInWorkspace.READER, False)
|
|
398
|
+ cont_api_a = ContentApi(user_a)
|
|
399
|
+ cont_api_b = ContentApi(user_b)
|
|
400
|
+
|
|
401
|
+ page_2 = cont_api_a.create(ContentType.Page, workspace, None, "this is page1", do_save=True)
|
|
402
|
+ page_3 = cont_api_a.create(ContentType.Thread, workspace, None, "this is page2", do_save=True)
|
|
403
|
+ page_4 = cont_api_a.create(ContentType.File, workspace, None, "this is page3", do_save=True)
|
|
404
|
+
|
|
405
|
+ for rev in page_2.revisions:
|
|
406
|
+ eq_(user_b not in rev.read_by.keys(), True)
|
|
407
|
+ for rev in page_3.revisions:
|
|
408
|
+ eq_(user_b not in rev.read_by.keys(), True)
|
|
409
|
+ for rev in page_4.revisions:
|
|
410
|
+ eq_(user_b not in rev.read_by.keys(), True)
|
|
411
|
+
|
|
412
|
+ DBSession.refresh(page_2)
|
|
413
|
+ DBSession.refresh(page_3)
|
|
414
|
+ DBSession.refresh(page_4)
|
|
415
|
+
|
|
416
|
+ cont_api_b.mark_read__all()
|
|
417
|
+
|
|
418
|
+ for rev in page_2.revisions:
|
|
419
|
+ eq_(user_b in rev.read_by.keys(), True)
|
|
420
|
+ for rev in page_3.revisions:
|
|
421
|
+ eq_(user_b in rev.read_by.keys(), True)
|
|
422
|
+ for rev in page_4.revisions:
|
|
423
|
+ eq_(user_b in rev.read_by.keys(), True)
|
424
|
424
|
|
425
|
425
|
|
426
|
426
|
|