|
|
@@ -107,7 +107,11 @@ class TestContentApi(DefaultTest):
|
|
107
|
107
|
config=self.app_config,
|
|
108
|
108
|
current_user=None,
|
|
109
|
109
|
)
|
|
110
|
|
- group_api = GroupApi(current_user=None,session=self.session)
|
|
|
110
|
+ group_api = GroupApi(
|
|
|
111
|
+ current_user=None,
|
|
|
112
|
+ session=self.session,
|
|
|
113
|
+ config=self.app_config,
|
|
|
114
|
+ )
|
|
111
|
115
|
groups = [group_api.get_one(Group.TIM_USER),
|
|
112
|
116
|
group_api.get_one(Group.TIM_MANAGER),
|
|
113
|
117
|
group_api.get_one(Group.TIM_ADMIN)]
|
|
|
@@ -116,7 +120,8 @@ class TestContentApi(DefaultTest):
|
|
116
|
120
|
groups=groups, save_now=True)
|
|
117
|
121
|
workspace = WorkspaceApi(
|
|
118
|
122
|
current_user=user,
|
|
119
|
|
- session=self.session
|
|
|
123
|
+ session=self.session,
|
|
|
124
|
+ config=self.app_config,
|
|
120
|
125
|
).create_workspace('test workspace', save_now=True)
|
|
121
|
126
|
api = ContentApi(
|
|
122
|
127
|
current_user=user,
|
|
|
@@ -133,7 +138,11 @@ class TestContentApi(DefaultTest):
|
|
133
|
138
|
|
|
134
|
139
|
# Refresh instances after commit
|
|
135
|
140
|
user = uapi.get_one(uid)
|
|
136
|
|
- workspace_api = WorkspaceApi(current_user=user, session=self.session)
|
|
|
141
|
+ workspace_api = WorkspaceApi(
|
|
|
142
|
+ current_user=user,
|
|
|
143
|
+ session=self.session,
|
|
|
144
|
+ config=self.app_config
|
|
|
145
|
+ )
|
|
137
|
146
|
workspace = workspace_api.get_one(wid)
|
|
138
|
147
|
api = ContentApi(
|
|
139
|
148
|
current_user=user,
|
|
|
@@ -154,7 +163,11 @@ class TestContentApi(DefaultTest):
|
|
154
|
163
|
|
|
155
|
164
|
# Refresh instances after commit
|
|
156
|
165
|
user = uapi.get_one(uid)
|
|
157
|
|
- workspace_api = WorkspaceApi(current_user=user, session=self.session)
|
|
|
166
|
+ workspace_api = WorkspaceApi(
|
|
|
167
|
+ current_user=user,
|
|
|
168
|
+ session=self.session,
|
|
|
169
|
+ config=self.app_config
|
|
|
170
|
+ )
|
|
158
|
171
|
workspace = workspace_api.get_one(wid)
|
|
159
|
172
|
api = ContentApi(
|
|
160
|
173
|
current_user=user,
|
|
|
@@ -168,7 +181,11 @@ class TestContentApi(DefaultTest):
|
|
168
|
181
|
# Test that the item is still available if "show deleted" is activated
|
|
169
|
182
|
# Refresh instances after commit
|
|
170
|
183
|
user = uapi.get_one(uid)
|
|
171
|
|
- workspace_api = WorkspaceApi(current_user=user, session=self.session)
|
|
|
184
|
+ workspace_api = WorkspaceApi(
|
|
|
185
|
+ current_user=user,
|
|
|
186
|
+ session=self.session,
|
|
|
187
|
+ config=self.app_config,
|
|
|
188
|
+ )
|
|
172
|
189
|
api = ContentApi(
|
|
173
|
190
|
current_user=user,
|
|
174
|
191
|
session=self.session,
|
|
|
@@ -184,14 +201,25 @@ class TestContentApi(DefaultTest):
|
|
184
|
201
|
config=self.app_config,
|
|
185
|
202
|
current_user=None,
|
|
186
|
203
|
)
|
|
187
|
|
- group_api = GroupApi(current_user=None, session=self.session)
|
|
|
204
|
+ group_api = GroupApi(
|
|
|
205
|
+ current_user=None,
|
|
|
206
|
+ session=self.session,
|
|
|
207
|
+ config=self.app_config,
|
|
|
208
|
+ )
|
|
188
|
209
|
groups = [group_api.get_one(Group.TIM_USER),
|
|
189
|
210
|
group_api.get_one(Group.TIM_MANAGER),
|
|
190
|
211
|
group_api.get_one(Group.TIM_ADMIN)]
|
|
191
|
212
|
|
|
192
|
|
- user = uapi.create_minimal_user(email='this.is@user',
|
|
193
|
|
- groups=groups, save_now=True)
|
|
194
|
|
- workspace_api = WorkspaceApi(current_user=user, session=self.session)
|
|
|
213
|
+ user = uapi.create_minimal_user(
|
|
|
214
|
+ email='this.is@user',
|
|
|
215
|
+ groups=groups,
|
|
|
216
|
+ save_now=True,
|
|
|
217
|
+ )
|
|
|
218
|
+ workspace_api = WorkspaceApi(
|
|
|
219
|
+ current_user=user,
|
|
|
220
|
+ session=self.session,
|
|
|
221
|
+ config=self.app_config,
|
|
|
222
|
+ )
|
|
195
|
223
|
workspace = workspace_api.create_workspace(
|
|
196
|
224
|
'test workspace',
|
|
197
|
225
|
save_now=True
|
|
|
@@ -210,7 +238,11 @@ class TestContentApi(DefaultTest):
|
|
210
|
238
|
transaction.commit()
|
|
211
|
239
|
# Refresh instances after commit
|
|
212
|
240
|
user = uapi.get_one(uid)
|
|
213
|
|
- workspace_api = WorkspaceApi(current_user=user, session=self.session)
|
|
|
241
|
+ workspace_api = WorkspaceApi(
|
|
|
242
|
+ current_user=user,
|
|
|
243
|
+ session=self.session,
|
|
|
244
|
+ config=self.app_config,
|
|
|
245
|
+ )
|
|
214
|
246
|
api = ContentApi(
|
|
215
|
247
|
session=self.session,
|
|
216
|
248
|
current_user=user,
|
|
|
@@ -231,7 +263,11 @@ class TestContentApi(DefaultTest):
|
|
231
|
263
|
|
|
232
|
264
|
# Refresh instances after commit
|
|
233
|
265
|
user = uapi.get_one(uid)
|
|
234
|
|
- workspace_api = WorkspaceApi(current_user=user, session=self.session)
|
|
|
266
|
+ workspace_api = WorkspaceApi(
|
|
|
267
|
+ current_user=user,
|
|
|
268
|
+ session=self.session,
|
|
|
269
|
+ config=self.app_config,
|
|
|
270
|
+ )
|
|
235
|
271
|
workspace = workspace_api.get_one(wid)
|
|
236
|
272
|
api = ContentApi(
|
|
237
|
273
|
current_user=user,
|
|
|
@@ -245,7 +281,11 @@ class TestContentApi(DefaultTest):
|
|
245
|
281
|
|
|
246
|
282
|
# Refresh instances after commit
|
|
247
|
283
|
user = uapi.get_one(uid)
|
|
248
|
|
- workspace_api = WorkspaceApi(current_user=user, session=self.session)
|
|
|
284
|
+ workspace_api = WorkspaceApi(
|
|
|
285
|
+ current_user=user,
|
|
|
286
|
+ session=self.session,
|
|
|
287
|
+ config=self.app_config,
|
|
|
288
|
+ )
|
|
249
|
289
|
workspace = workspace_api.get_one(wid)
|
|
250
|
290
|
api = ContentApi(
|
|
251
|
291
|
current_user=user,
|
|
|
@@ -269,7 +309,11 @@ class TestContentApi(DefaultTest):
|
|
269
|
309
|
config=self.app_config,
|
|
270
|
310
|
current_user=None,
|
|
271
|
311
|
)
|
|
272
|
|
- group_api = GroupApi(current_user=None, session=self.session)
|
|
|
312
|
+ group_api = GroupApi(
|
|
|
313
|
+ current_user=None,
|
|
|
314
|
+ session=self.session,
|
|
|
315
|
+ config=self.app_config,
|
|
|
316
|
+ )
|
|
273
|
317
|
groups = [group_api.get_one(Group.TIM_USER),
|
|
274
|
318
|
group_api.get_one(Group.TIM_MANAGER),
|
|
275
|
319
|
group_api.get_one(Group.TIM_ADMIN)]
|
|
|
@@ -281,7 +325,8 @@ class TestContentApi(DefaultTest):
|
|
281
|
325
|
)
|
|
282
|
326
|
workspace = WorkspaceApi(
|
|
283
|
327
|
current_user=user,
|
|
284
|
|
- session=self.session
|
|
|
328
|
+ session=self.session,
|
|
|
329
|
+ config=self.app_config,
|
|
285
|
330
|
).create_workspace(
|
|
286
|
331
|
'test workspace',
|
|
287
|
332
|
save_now=True
|
|
|
@@ -301,7 +346,11 @@ class TestContentApi(DefaultTest):
|
|
301
|
346
|
|
|
302
|
347
|
# Refresh instances after commit
|
|
303
|
348
|
user = uapi.get_one(uid)
|
|
304
|
|
- workspace_api = WorkspaceApi(current_user=user, session=self.session)
|
|
|
349
|
+ workspace_api = WorkspaceApi(
|
|
|
350
|
+ current_user=user,
|
|
|
351
|
+ session=self.session,
|
|
|
352
|
+ config=self.app_config,
|
|
|
353
|
+ )
|
|
305
|
354
|
workspace = workspace_api.get_one(wid)
|
|
306
|
355
|
api = ContentApi(
|
|
307
|
356
|
current_user=user,
|
|
|
@@ -326,7 +375,11 @@ class TestContentApi(DefaultTest):
|
|
326
|
375
|
config=self.app_config,
|
|
327
|
376
|
current_user=None,
|
|
328
|
377
|
)
|
|
329
|
|
- group_api = GroupApi(current_user=None, session=self.session)
|
|
|
378
|
+ group_api = GroupApi(
|
|
|
379
|
+ current_user=None,
|
|
|
380
|
+ session=self.session,
|
|
|
381
|
+ config=self.app_config
|
|
|
382
|
+ )
|
|
330
|
383
|
groups = [group_api.get_one(Group.TIM_USER),
|
|
331
|
384
|
group_api.get_one(Group.TIM_MANAGER),
|
|
332
|
385
|
group_api.get_one(Group.TIM_ADMIN)]
|
|
|
@@ -335,7 +388,8 @@ class TestContentApi(DefaultTest):
|
|
335
|
388
|
groups=groups, save_now=True)
|
|
336
|
389
|
workspace = WorkspaceApi(
|
|
337
|
390
|
current_user=user,
|
|
338
|
|
- session=self.session
|
|
|
391
|
+ session=self.session,
|
|
|
392
|
+ config=self.app_config
|
|
339
|
393
|
).create_workspace('test workspace', save_now=True)
|
|
340
|
394
|
api = ContentApi(
|
|
341
|
395
|
current_user=user,
|
|
|
@@ -371,7 +425,11 @@ class TestContentApi(DefaultTest):
|
|
371
|
425
|
|
|
372
|
426
|
# Refresh instances after commit
|
|
373
|
427
|
user = uapi.get_one(uid)
|
|
374
|
|
- workspace_api = WorkspaceApi(current_user=user, session=self.session)
|
|
|
428
|
+ workspace_api = WorkspaceApi(
|
|
|
429
|
+ current_user=user,
|
|
|
430
|
+ session=self.session,
|
|
|
431
|
+ config=self.app_config,
|
|
|
432
|
+ )
|
|
375
|
433
|
workspace = workspace_api.get_one(wid)
|
|
376
|
434
|
api = ContentApi(
|
|
377
|
435
|
current_user=user,
|
|
|
@@ -394,7 +452,8 @@ class TestContentApi(DefaultTest):
|
|
394
|
452
|
)
|
|
395
|
453
|
group_api = GroupApi(
|
|
396
|
454
|
current_user=None,
|
|
397
|
|
- session=self.session
|
|
|
455
|
+ session=self.session,
|
|
|
456
|
+ config=self.app_config,
|
|
398
|
457
|
)
|
|
399
|
458
|
groups = [group_api.get_one(Group.TIM_USER),
|
|
400
|
459
|
group_api.get_one(Group.TIM_MANAGER),
|
|
|
@@ -405,7 +464,8 @@ class TestContentApi(DefaultTest):
|
|
405
|
464
|
|
|
406
|
465
|
workspace = WorkspaceApi(
|
|
407
|
466
|
current_user=user,
|
|
408
|
|
- session=self.session
|
|
|
467
|
+ session=self.session,
|
|
|
468
|
+ config=self.app_config,
|
|
409
|
469
|
).create_workspace(
|
|
410
|
470
|
'test workspace',
|
|
411
|
471
|
save_now=True
|
|
|
@@ -432,7 +492,8 @@ class TestContentApi(DefaultTest):
|
|
432
|
492
|
)
|
|
433
|
493
|
group_api = GroupApi(
|
|
434
|
494
|
current_user=None,
|
|
435
|
|
- session=self.session
|
|
|
495
|
+ session=self.session,
|
|
|
496
|
+ config=self.app_config,
|
|
436
|
497
|
)
|
|
437
|
498
|
groups = [group_api.get_one(Group.TIM_USER),
|
|
438
|
499
|
group_api.get_one(Group.TIM_MANAGER),
|
|
|
@@ -443,7 +504,8 @@ class TestContentApi(DefaultTest):
|
|
443
|
504
|
|
|
444
|
505
|
workspace = WorkspaceApi(
|
|
445
|
506
|
current_user=user,
|
|
446
|
|
- session=self.session
|
|
|
507
|
+ session=self.session,
|
|
|
508
|
+ config=self.app_config,
|
|
447
|
509
|
).create_workspace(
|
|
448
|
510
|
'test workspace',
|
|
449
|
511
|
save_now=True
|
|
|
@@ -474,7 +536,8 @@ class TestContentApi(DefaultTest):
|
|
474
|
536
|
)
|
|
475
|
537
|
group_api = GroupApi(
|
|
476
|
538
|
current_user=None,
|
|
477
|
|
- session=self.session
|
|
|
539
|
+ session=self.session,
|
|
|
540
|
+ config=self.config,
|
|
478
|
541
|
)
|
|
479
|
542
|
groups = [group_api.get_one(Group.TIM_USER),
|
|
480
|
543
|
group_api.get_one(Group.TIM_MANAGER),
|
|
|
@@ -485,7 +548,8 @@ class TestContentApi(DefaultTest):
|
|
485
|
548
|
|
|
486
|
549
|
workspace = WorkspaceApi(
|
|
487
|
550
|
current_user=user,
|
|
488
|
|
- session=self.session
|
|
|
551
|
+ session=self.session,
|
|
|
552
|
+ config=self.app_config,
|
|
489
|
553
|
).create_workspace(
|
|
490
|
554
|
'test workspace',
|
|
491
|
555
|
save_now=True
|
|
|
@@ -516,7 +580,8 @@ class TestContentApi(DefaultTest):
|
|
516
|
580
|
)
|
|
517
|
581
|
group_api = GroupApi(
|
|
518
|
582
|
current_user=None,
|
|
519
|
|
- session=self.session
|
|
|
583
|
+ session=self.session,
|
|
|
584
|
+ config=self.app_config
|
|
520
|
585
|
)
|
|
521
|
586
|
groups = [group_api.get_one(Group.TIM_USER),
|
|
522
|
587
|
group_api.get_one(Group.TIM_MANAGER),
|
|
|
@@ -534,12 +599,17 @@ class TestContentApi(DefaultTest):
|
|
534
|
599
|
)
|
|
535
|
600
|
workspace = WorkspaceApi(
|
|
536
|
601
|
current_user=user,
|
|
537
|
|
- session=self.session
|
|
|
602
|
+ session=self.session,
|
|
|
603
|
+ config=self.app_config,
|
|
538
|
604
|
).create_workspace(
|
|
539
|
605
|
'test workspace',
|
|
540
|
606
|
save_now=True
|
|
541
|
607
|
)
|
|
542
|
|
- RoleApi(current_user=user, session=self.session).create_one(
|
|
|
608
|
+ RoleApi(
|
|
|
609
|
+ current_user=user,
|
|
|
610
|
+ session=self.session,
|
|
|
611
|
+ config=self.app_config,
|
|
|
612
|
+ ).create_one(
|
|
543
|
613
|
user2,
|
|
544
|
614
|
workspace,
|
|
545
|
615
|
UserRoleInWorkspace.WORKSPACE_MANAGER,
|
|
|
@@ -581,6 +651,7 @@ class TestContentApi(DefaultTest):
|
|
581
|
651
|
workspace2 = WorkspaceApi(
|
|
582
|
652
|
current_user=user2,
|
|
583
|
653
|
session=self.session,
|
|
|
654
|
+ config=self.app_config,
|
|
584
|
655
|
).create_workspace(
|
|
585
|
656
|
'test workspace2',
|
|
586
|
657
|
save_now=True
|
|
|
@@ -628,7 +699,8 @@ class TestContentApi(DefaultTest):
|
|
628
|
699
|
)
|
|
629
|
700
|
group_api = GroupApi(
|
|
630
|
701
|
current_user=None,
|
|
631
|
|
- session=self.session
|
|
|
702
|
+ session=self.session,
|
|
|
703
|
+ config=self.app_config,
|
|
632
|
704
|
)
|
|
633
|
705
|
groups = [group_api.get_one(Group.TIM_USER),
|
|
634
|
706
|
group_api.get_one(Group.TIM_MANAGER),
|
|
|
@@ -646,12 +718,17 @@ class TestContentApi(DefaultTest):
|
|
646
|
718
|
)
|
|
647
|
719
|
workspace = WorkspaceApi(
|
|
648
|
720
|
current_user=user,
|
|
649
|
|
- session=self.session
|
|
|
721
|
+ session=self.session,
|
|
|
722
|
+ config=self.app_config,
|
|
650
|
723
|
).create_workspace(
|
|
651
|
724
|
'test workspace',
|
|
652
|
725
|
save_now=True
|
|
653
|
726
|
)
|
|
654
|
|
- RoleApi(current_user=user, session=self.session).create_one(
|
|
|
727
|
+ RoleApi(
|
|
|
728
|
+ current_user=user,
|
|
|
729
|
+ session=self.session,
|
|
|
730
|
+ config=self.app_config,
|
|
|
731
|
+ ).create_one(
|
|
655
|
732
|
user2,
|
|
656
|
733
|
workspace,
|
|
657
|
734
|
UserRoleInWorkspace.WORKSPACE_MANAGER,
|
|
|
@@ -692,7 +769,8 @@ class TestContentApi(DefaultTest):
|
|
692
|
769
|
)
|
|
693
|
770
|
workspace2 = WorkspaceApi(
|
|
694
|
771
|
current_user=user2,
|
|
695
|
|
- session=self.session
|
|
|
772
|
+ session=self.session,
|
|
|
773
|
+ config=self.app_config,
|
|
696
|
774
|
).create_workspace(
|
|
697
|
775
|
'test workspace2',
|
|
698
|
776
|
save_now=True
|
|
|
@@ -738,7 +816,8 @@ class TestContentApi(DefaultTest):
|
|
738
|
816
|
)
|
|
739
|
817
|
group_api = GroupApi(
|
|
740
|
818
|
current_user=None,
|
|
741
|
|
- session=self.session
|
|
|
819
|
+ session=self.session,
|
|
|
820
|
+ config=self.app_config,
|
|
742
|
821
|
)
|
|
743
|
822
|
groups = [group_api.get_one(Group.TIM_USER),
|
|
744
|
823
|
group_api.get_one(Group.TIM_MANAGER),
|
|
|
@@ -756,12 +835,17 @@ class TestContentApi(DefaultTest):
|
|
756
|
835
|
)
|
|
757
|
836
|
workspace = WorkspaceApi(
|
|
758
|
837
|
current_user=user,
|
|
759
|
|
- session=self.session
|
|
|
838
|
+ session=self.session,
|
|
|
839
|
+ config=self.app_config,
|
|
760
|
840
|
).create_workspace(
|
|
761
|
841
|
'test workspace',
|
|
762
|
842
|
save_now=True
|
|
763
|
843
|
)
|
|
764
|
|
- RoleApi(current_user=user, session=self.session).create_one(
|
|
|
844
|
+ RoleApi(
|
|
|
845
|
+ current_user=user,
|
|
|
846
|
+ session=self.session,
|
|
|
847
|
+ config=self.app_config,
|
|
|
848
|
+ ).create_one(
|
|
765
|
849
|
user2, workspace,
|
|
766
|
850
|
UserRoleInWorkspace.WORKSPACE_MANAGER,
|
|
767
|
851
|
with_notif=False
|
|
|
@@ -837,7 +921,8 @@ class TestContentApi(DefaultTest):
|
|
837
|
921
|
)
|
|
838
|
922
|
group_api = GroupApi(
|
|
839
|
923
|
current_user=None,
|
|
840
|
|
- session=self.session
|
|
|
924
|
+ session=self.session,
|
|
|
925
|
+ config=self.app_config,
|
|
841
|
926
|
)
|
|
842
|
927
|
groups = [group_api.get_one(Group.TIM_USER),
|
|
843
|
928
|
group_api.get_one(Group.TIM_MANAGER),
|
|
|
@@ -851,6 +936,7 @@ class TestContentApi(DefaultTest):
|
|
851
|
936
|
wapi = WorkspaceApi(
|
|
852
|
937
|
current_user=user_a,
|
|
853
|
938
|
session=self.session,
|
|
|
939
|
+ config=self.app_config,
|
|
854
|
940
|
)
|
|
855
|
941
|
workspace1 = wapi.create_workspace(
|
|
856
|
942
|
'test workspace n°1',
|
|
|
@@ -862,6 +948,7 @@ class TestContentApi(DefaultTest):
|
|
862
|
948
|
role_api1 = RoleApi(
|
|
863
|
949
|
current_user=user_a,
|
|
864
|
950
|
session=self.session,
|
|
|
951
|
+ config=self.app_config,
|
|
865
|
952
|
)
|
|
866
|
953
|
role_api1.create_one(
|
|
867
|
954
|
user_b,
|
|
|
@@ -873,6 +960,7 @@ class TestContentApi(DefaultTest):
|
|
873
|
960
|
role_api2 = RoleApi(
|
|
874
|
961
|
current_user=user_b,
|
|
875
|
962
|
session=self.session,
|
|
|
963
|
+ config=self.app_config,
|
|
876
|
964
|
)
|
|
877
|
965
|
role_api2.create_one(user_b, workspace2, UserRoleInWorkspace.READER,
|
|
878
|
966
|
False)
|
|
|
@@ -940,7 +1028,8 @@ class TestContentApi(DefaultTest):
|
|
940
|
1028
|
)
|
|
941
|
1029
|
group_api = GroupApi(
|
|
942
|
1030
|
current_user=None,
|
|
943
|
|
- session=self.session
|
|
|
1031
|
+ session=self.session,
|
|
|
1032
|
+ config = self.app_config,
|
|
944
|
1033
|
)
|
|
945
|
1034
|
groups = [group_api.get_one(Group.TIM_USER),
|
|
946
|
1035
|
group_api.get_one(Group.TIM_MANAGER),
|
|
|
@@ -957,10 +1046,15 @@ class TestContentApi(DefaultTest):
|
|
957
|
1046
|
save_now=True
|
|
958
|
1047
|
)
|
|
959
|
1048
|
|
|
960
|
|
- wapi = WorkspaceApi(current_user=user_a, session=self.session)
|
|
|
1049
|
+ wapi = WorkspaceApi(
|
|
|
1050
|
+ current_user=user_a,
|
|
|
1051
|
+ session=self.session,
|
|
|
1052
|
+ config=self.app_config,
|
|
|
1053
|
+ )
|
|
961
|
1054
|
workspace_api = WorkspaceApi(
|
|
962
|
1055
|
current_user=user_a,
|
|
963
|
|
- session=self.session
|
|
|
1056
|
+ session=self.session,
|
|
|
1057
|
+ config=self.app_config,
|
|
964
|
1058
|
)
|
|
965
|
1059
|
workspace = wapi.create_workspace(
|
|
966
|
1060
|
'test workspace',
|
|
|
@@ -969,6 +1063,7 @@ class TestContentApi(DefaultTest):
|
|
969
|
1063
|
role_api = RoleApi(
|
|
970
|
1064
|
current_user=user_a,
|
|
971
|
1065
|
session=self.session,
|
|
|
1066
|
+ config=self.app_config,
|
|
972
|
1067
|
)
|
|
973
|
1068
|
role_api.create_one(
|
|
974
|
1069
|
user_b,
|
|
|
@@ -1004,7 +1099,11 @@ class TestContentApi(DefaultTest):
|
|
1004
|
1099
|
config=self.app_config,
|
|
1005
|
1100
|
current_user=None,
|
|
1006
|
1101
|
)
|
|
1007
|
|
- group_api = GroupApi(current_user=None, session=self.session)
|
|
|
1102
|
+ group_api = GroupApi(
|
|
|
1103
|
+ current_user=None,
|
|
|
1104
|
+ session=self.session,
|
|
|
1105
|
+ config=self.app_config,
|
|
|
1106
|
+ )
|
|
1008
|
1107
|
groups = [group_api.get_one(Group.TIM_USER),
|
|
1009
|
1108
|
group_api.get_one(Group.TIM_MANAGER),
|
|
1010
|
1109
|
group_api.get_one(Group.TIM_ADMIN)]
|
|
|
@@ -1023,6 +1122,7 @@ class TestContentApi(DefaultTest):
|
|
1023
|
1122
|
wapi = WorkspaceApi(
|
|
1024
|
1123
|
current_user=user_a,
|
|
1025
|
1124
|
session=self.session,
|
|
|
1125
|
+ config=self.app_config,
|
|
1026
|
1126
|
)
|
|
1027
|
1127
|
workspace = wapi.create_workspace(
|
|
1028
|
1128
|
'test workspace',
|
|
|
@@ -1031,6 +1131,7 @@ class TestContentApi(DefaultTest):
|
|
1031
|
1131
|
role_api = RoleApi(
|
|
1032
|
1132
|
current_user=user_a,
|
|
1033
|
1133
|
session=self.session,
|
|
|
1134
|
+ config=self.app_config,
|
|
1034
|
1135
|
)
|
|
1035
|
1136
|
role_api.create_one(
|
|
1036
|
1137
|
user_b,
|
|
|
@@ -1097,7 +1198,11 @@ class TestContentApi(DefaultTest):
|
|
1097
|
1198
|
config=self.app_config,
|
|
1098
|
1199
|
current_user=None,
|
|
1099
|
1200
|
)
|
|
1100
|
|
- group_api = GroupApi(current_user=None, session=self.session)
|
|
|
1201
|
+ group_api = GroupApi(
|
|
|
1202
|
+ current_user=None,
|
|
|
1203
|
+ session=self.session,
|
|
|
1204
|
+ config=self.app_config,
|
|
|
1205
|
+ )
|
|
1101
|
1206
|
groups = [group_api.get_one(Group.TIM_USER),
|
|
1102
|
1207
|
group_api.get_one(Group.TIM_MANAGER),
|
|
1103
|
1208
|
group_api.get_one(Group.TIM_ADMIN)]
|
|
|
@@ -1108,7 +1213,11 @@ class TestContentApi(DefaultTest):
|
|
1108
|
1213
|
save_now=True
|
|
1109
|
1214
|
)
|
|
1110
|
1215
|
|
|
1111
|
|
- workspace_api = WorkspaceApi(current_user=user1, session=self.session)
|
|
|
1216
|
+ workspace_api = WorkspaceApi(
|
|
|
1217
|
+ current_user=user1,
|
|
|
1218
|
+ session=self.session,
|
|
|
1219
|
+ config=self.app_config,
|
|
|
1220
|
+ )
|
|
1112
|
1221
|
workspace = workspace_api.create_workspace(
|
|
1113
|
1222
|
'test workspace',
|
|
1114
|
1223
|
save_now=True
|
|
|
@@ -1121,7 +1230,8 @@ class TestContentApi(DefaultTest):
|
|
1121
|
1230
|
|
|
1122
|
1231
|
RoleApi(
|
|
1123
|
1232
|
current_user=user1,
|
|
1124
|
|
- session=self.session
|
|
|
1233
|
+ session=self.session,
|
|
|
1234
|
+ config=self.app_config,
|
|
1125
|
1235
|
).create_one(
|
|
1126
|
1236
|
user2,
|
|
1127
|
1237
|
workspace,
|
|
|
@@ -1152,7 +1262,8 @@ class TestContentApi(DefaultTest):
|
|
1152
|
1262
|
user1 = uapi.get_one(u1id)
|
|
1153
|
1263
|
workspace = WorkspaceApi(
|
|
1154
|
1264
|
current_user=user1,
|
|
1155
|
|
- session=self.session
|
|
|
1265
|
+ session=self.session,
|
|
|
1266
|
+ config=self.app_config,
|
|
1156
|
1267
|
).get_one(wid)
|
|
1157
|
1268
|
api = ContentApi(
|
|
1158
|
1269
|
current_user=user1,
|
|
|
@@ -1193,6 +1304,7 @@ class TestContentApi(DefaultTest):
|
|
1193
|
1304
|
workspace = WorkspaceApi(
|
|
1194
|
1305
|
current_user=user1,
|
|
1195
|
1306
|
session=self.session,
|
|
|
1307
|
+ config=self.app_config,
|
|
1196
|
1308
|
).get_one(wid)
|
|
1197
|
1309
|
api = ContentApi(
|
|
1198
|
1310
|
current_user=user1,
|
|
|
@@ -1216,7 +1328,8 @@ class TestContentApi(DefaultTest):
|
|
1216
|
1328
|
)
|
|
1217
|
1329
|
group_api = GroupApi(
|
|
1218
|
1330
|
current_user=None,
|
|
1219
|
|
- session=self.session
|
|
|
1331
|
+ session=self.session,
|
|
|
1332
|
+ config = self.app_config,
|
|
1220
|
1333
|
)
|
|
1221
|
1334
|
groups = [group_api.get_one(Group.TIM_USER),
|
|
1222
|
1335
|
group_api.get_one(Group.TIM_MANAGER),
|
|
|
@@ -1231,6 +1344,7 @@ class TestContentApi(DefaultTest):
|
|
1231
|
1344
|
workspace = WorkspaceApi(
|
|
1232
|
1345
|
current_user=user1,
|
|
1233
|
1346
|
session=self.session,
|
|
|
1347
|
+ config=self.app_config,
|
|
1234
|
1348
|
).create_workspace(
|
|
1235
|
1349
|
'test workspace',
|
|
1236
|
1350
|
save_now=True
|
|
|
@@ -1241,7 +1355,8 @@ class TestContentApi(DefaultTest):
|
|
1241
|
1355
|
|
|
1242
|
1356
|
RoleApi(
|
|
1243
|
1357
|
current_user=user1,
|
|
1244
|
|
- session=self.session
|
|
|
1358
|
+ session=self.session,
|
|
|
1359
|
+ config=self.app_config,
|
|
1245
|
1360
|
).create_one(
|
|
1246
|
1361
|
user2,
|
|
1247
|
1362
|
workspace,
|
|
|
@@ -1293,7 +1408,8 @@ class TestContentApi(DefaultTest):
|
|
1293
|
1408
|
)
|
|
1294
|
1409
|
group_api = GroupApi(
|
|
1295
|
1410
|
current_user=None,
|
|
1296
|
|
- session=self.session
|
|
|
1411
|
+ session=self.session,
|
|
|
1412
|
+ config=self.app_config,
|
|
1297
|
1413
|
)
|
|
1298
|
1414
|
groups = [group_api.get_one(Group.TIM_USER),
|
|
1299
|
1415
|
group_api.get_one(Group.TIM_MANAGER),
|
|
|
@@ -1305,7 +1421,11 @@ class TestContentApi(DefaultTest):
|
|
1305
|
1421
|
save_now=True
|
|
1306
|
1422
|
)
|
|
1307
|
1423
|
|
|
1308
|
|
- workspace_api = WorkspaceApi(current_user=user1, session=self.session)
|
|
|
1424
|
+ workspace_api = WorkspaceApi(
|
|
|
1425
|
+ current_user=user1,
|
|
|
1426
|
+ session=self.session,
|
|
|
1427
|
+ config=self.app_config,
|
|
|
1428
|
+ )
|
|
1309
|
1429
|
workspace = workspace_api.create_workspace(
|
|
1310
|
1430
|
'test workspace',
|
|
1311
|
1431
|
save_now=True
|
|
|
@@ -1318,6 +1438,7 @@ class TestContentApi(DefaultTest):
|
|
1318
|
1438
|
RoleApi(
|
|
1319
|
1439
|
current_user=user1,
|
|
1320
|
1440
|
session=self.session,
|
|
|
1441
|
+ config=self.app_config,
|
|
1321
|
1442
|
).create_one(
|
|
1322
|
1443
|
user2,
|
|
1323
|
1444
|
workspace,
|
|
|
@@ -1345,7 +1466,11 @@ class TestContentApi(DefaultTest):
|
|
1345
|
1466
|
|
|
1346
|
1467
|
# Refresh instances after commit
|
|
1347
|
1468
|
user1 = uapi.get_one(u1id)
|
|
1348
|
|
- workspace_api2 = WorkspaceApi(current_user=user1, session=self.session)
|
|
|
1469
|
+ workspace_api2 = WorkspaceApi(
|
|
|
1470
|
+ current_user=user1,
|
|
|
1471
|
+ session=self.session,
|
|
|
1472
|
+ config=self.app_config,
|
|
|
1473
|
+ )
|
|
1349
|
1474
|
workspace = workspace_api2.get_one(wid)
|
|
1350
|
1475
|
api = ContentApi(
|
|
1351
|
1476
|
current_user=user1,
|
|
|
@@ -1387,6 +1512,7 @@ class TestContentApi(DefaultTest):
|
|
1387
|
1512
|
workspace = WorkspaceApi(
|
|
1388
|
1513
|
current_user=user1,
|
|
1389
|
1514
|
session=self.session,
|
|
|
1515
|
+ config=self.app_config,
|
|
1390
|
1516
|
).get_one(wid)
|
|
1391
|
1517
|
|
|
1392
|
1518
|
updated = api.get_one(pcid, ContentType.Any, workspace)
|
|
|
@@ -1407,6 +1533,7 @@ class TestContentApi(DefaultTest):
|
|
1407
|
1533
|
group_api = GroupApi(
|
|
1408
|
1534
|
current_user=None,
|
|
1409
|
1535
|
session=self.session,
|
|
|
1536
|
+ config=self.app_config,
|
|
1410
|
1537
|
)
|
|
1411
|
1538
|
groups = [group_api.get_one(Group.TIM_USER),
|
|
1412
|
1539
|
group_api.get_one(Group.TIM_MANAGER),
|
|
|
@@ -1418,7 +1545,11 @@ class TestContentApi(DefaultTest):
|
|
1418
|
1545
|
save_now=True,
|
|
1419
|
1546
|
)
|
|
1420
|
1547
|
|
|
1421
|
|
- workspace_api = WorkspaceApi(current_user=user1, session=self.session)
|
|
|
1548
|
+ workspace_api = WorkspaceApi(
|
|
|
1549
|
+ current_user=user1,
|
|
|
1550
|
+ session=self.session,
|
|
|
1551
|
+ config=self.app_config,
|
|
|
1552
|
+ )
|
|
1422
|
1553
|
workspace = workspace_api.create_workspace(
|
|
1423
|
1554
|
'test workspace',
|
|
1424
|
1555
|
save_now=True
|
|
|
@@ -1430,6 +1561,7 @@ class TestContentApi(DefaultTest):
|
|
1430
|
1561
|
RoleApi(
|
|
1431
|
1562
|
current_user=user1,
|
|
1432
|
1563
|
session=self.session,
|
|
|
1564
|
+ config=self.app_config,
|
|
1433
|
1565
|
).create_one(
|
|
1434
|
1566
|
user2,
|
|
1435
|
1567
|
workspace,
|
|
|
@@ -1485,7 +1617,11 @@ class TestContentApi(DefaultTest):
|
|
1485
|
1617
|
config=self.app_config,
|
|
1486
|
1618
|
current_user=None,
|
|
1487
|
1619
|
)
|
|
1488
|
|
- group_api = GroupApi(current_user=None, session=self.session)
|
|
|
1620
|
+ group_api = GroupApi(
|
|
|
1621
|
+ current_user=None,
|
|
|
1622
|
+ session=self.session,
|
|
|
1623
|
+ config=self.app_config,
|
|
|
1624
|
+ )
|
|
1489
|
1625
|
groups = [group_api.get_one(Group.TIM_USER),
|
|
1490
|
1626
|
group_api.get_one(Group.TIM_MANAGER),
|
|
1491
|
1627
|
group_api.get_one(Group.TIM_ADMIN)]
|
|
|
@@ -1497,7 +1633,11 @@ class TestContentApi(DefaultTest):
|
|
1497
|
1633
|
)
|
|
1498
|
1634
|
u1id = user1.user_id
|
|
1499
|
1635
|
|
|
1500
|
|
- workspace_api = WorkspaceApi(current_user=user1, session=self.session)
|
|
|
1636
|
+ workspace_api = WorkspaceApi(
|
|
|
1637
|
+ current_user=user1,
|
|
|
1638
|
+ session=self.session,
|
|
|
1639
|
+ config=self.app_config,
|
|
|
1640
|
+ )
|
|
1501
|
1641
|
workspace = workspace_api.create_workspace(
|
|
1502
|
1642
|
'test workspace',
|
|
1503
|
1643
|
save_now=True
|
|
|
@@ -1509,7 +1649,8 @@ class TestContentApi(DefaultTest):
|
|
1509
|
1649
|
|
|
1510
|
1650
|
RoleApi(
|
|
1511
|
1651
|
current_user=user1,
|
|
1512
|
|
- session=self.session
|
|
|
1652
|
+ session=self.session,
|
|
|
1653
|
+ config=self.app_config,
|
|
1513
|
1654
|
).create_one(
|
|
1514
|
1655
|
user2,
|
|
1515
|
1656
|
workspace,
|
|
|
@@ -1545,7 +1686,8 @@ class TestContentApi(DefaultTest):
|
|
1545
|
1686
|
).get_one(u1id)
|
|
1546
|
1687
|
workspace = WorkspaceApi(
|
|
1547
|
1688
|
current_user=user1,
|
|
1548
|
|
- session=self.session
|
|
|
1689
|
+ session=self.session,
|
|
|
1690
|
+ config=self.app_config,
|
|
1549
|
1691
|
).get_one(wid)
|
|
1550
|
1692
|
|
|
1551
|
1693
|
content = api.get_one(pcid, ContentType.Any, workspace)
|
|
|
@@ -1583,6 +1725,7 @@ class TestContentApi(DefaultTest):
|
|
1583
|
1725
|
workspace = WorkspaceApi(
|
|
1584
|
1726
|
current_user=user1,
|
|
1585
|
1727
|
session=self.session,
|
|
|
1728
|
+ config=self.app_config,
|
|
1586
|
1729
|
).get_one(wid)
|
|
1587
|
1730
|
u2 = UserApi(
|
|
1588
|
1731
|
current_user=None,
|
|
|
@@ -1632,7 +1775,8 @@ class TestContentApi(DefaultTest):
|
|
1632
|
1775
|
)
|
|
1633
|
1776
|
group_api = GroupApi(
|
|
1634
|
1777
|
current_user=None,
|
|
1635
|
|
- session=self.session
|
|
|
1778
|
+ session=self.session,
|
|
|
1779
|
+ config=self.app_config,
|
|
1636
|
1780
|
)
|
|
1637
|
1781
|
groups = [group_api.get_one(Group.TIM_USER),
|
|
1638
|
1782
|
group_api.get_one(Group.TIM_MANAGER),
|
|
|
@@ -1645,7 +1789,11 @@ class TestContentApi(DefaultTest):
|
|
1645
|
1789
|
)
|
|
1646
|
1790
|
u1id = user1.user_id
|
|
1647
|
1791
|
|
|
1648
|
|
- workspace_api = WorkspaceApi(current_user=user1, session=self.session)
|
|
|
1792
|
+ workspace_api = WorkspaceApi(
|
|
|
1793
|
+ current_user=user1,
|
|
|
1794
|
+ session=self.session,
|
|
|
1795
|
+ config=self.app_config,
|
|
|
1796
|
+ )
|
|
1649
|
1797
|
workspace = workspace_api.create_workspace(
|
|
1650
|
1798
|
'test workspace',
|
|
1651
|
1799
|
save_now=True
|
|
|
@@ -1657,7 +1805,8 @@ class TestContentApi(DefaultTest):
|
|
1657
|
1805
|
|
|
1658
|
1806
|
RoleApi(
|
|
1659
|
1807
|
current_user=user1,
|
|
1660
|
|
- session=self.session
|
|
|
1808
|
+ session=self.session,
|
|
|
1809
|
+ config=self.app_config,
|
|
1661
|
1810
|
).create_one(
|
|
1662
|
1811
|
user2,
|
|
1663
|
1812
|
workspace,
|
|
|
@@ -1692,6 +1841,7 @@ class TestContentApi(DefaultTest):
|
|
1692
|
1841
|
workspace = WorkspaceApi(
|
|
1693
|
1842
|
current_user=user1,
|
|
1694
|
1843
|
session=self.session,
|
|
|
1844
|
+ config=self.app_config,
|
|
1695
|
1845
|
).get_one(wid)
|
|
1696
|
1846
|
|
|
1697
|
1847
|
content = api.get_one(pcid, ContentType.Any, workspace)
|
|
|
@@ -1729,6 +1879,7 @@ class TestContentApi(DefaultTest):
|
|
1729
|
1879
|
workspace = WorkspaceApi(
|
|
1730
|
1880
|
current_user=user1,
|
|
1731
|
1881
|
session=self.session,
|
|
|
1882
|
+ config=self.app_config,
|
|
1732
|
1883
|
).get_one(wid)
|
|
1733
|
1884
|
# show archived is used at the top end of the test
|
|
1734
|
1885
|
api = ContentApi(
|
|
|
@@ -1782,6 +1933,7 @@ class TestContentApi(DefaultTest):
|
|
1782
|
1933
|
group_api = GroupApi(
|
|
1783
|
1934
|
current_user=None,
|
|
1784
|
1935
|
session=self.session,
|
|
|
1936
|
+ config=self.app_config,
|
|
1785
|
1937
|
)
|
|
1786
|
1938
|
groups = [group_api.get_one(Group.TIM_USER),
|
|
1787
|
1939
|
group_api.get_one(Group.TIM_MANAGER),
|
|
|
@@ -1792,7 +1944,8 @@ class TestContentApi(DefaultTest):
|
|
1792
|
1944
|
|
|
1793
|
1945
|
workspace = WorkspaceApi(
|
|
1794
|
1946
|
current_user=user,
|
|
1795
|
|
- session=self.session
|
|
|
1947
|
+ session=self.session,
|
|
|
1948
|
+ config=self.app_config,
|
|
1796
|
1949
|
).create_workspace(
|
|
1797
|
1950
|
'test workspace',
|
|
1798
|
1951
|
save_now=True
|
|
|
@@ -1802,7 +1955,6 @@ class TestContentApi(DefaultTest):
|
|
1802
|
1955
|
current_user=user,
|
|
1803
|
1956
|
session=self.session,
|
|
1804
|
1957
|
config=self.app_config,
|
|
1805
|
|
-
|
|
1806
|
1958
|
)
|
|
1807
|
1959
|
a = api.create(ContentType.Folder, workspace, None,
|
|
1808
|
1960
|
'this is randomized folder', True)
|
|
|
@@ -1837,6 +1989,7 @@ class TestContentApi(DefaultTest):
|
|
1837
|
1989
|
group_api = GroupApi(
|
|
1838
|
1990
|
current_user=None,
|
|
1839
|
1991
|
session=self.session,
|
|
|
1992
|
+ config=self.app_config,
|
|
1840
|
1993
|
)
|
|
1841
|
1994
|
groups = [group_api.get_one(Group.TIM_USER),
|
|
1842
|
1995
|
group_api.get_one(Group.TIM_MANAGER),
|
|
|
@@ -1847,7 +2000,8 @@ class TestContentApi(DefaultTest):
|
|
1847
|
2000
|
|
|
1848
|
2001
|
workspace = WorkspaceApi(
|
|
1849
|
2002
|
current_user=user,
|
|
1850
|
|
- session=self.session
|
|
|
2003
|
+ session=self.session,
|
|
|
2004
|
+ config=self.app_config,
|
|
1851
|
2005
|
).create_workspace(
|
|
1852
|
2006
|
'test workspace',
|
|
1853
|
2007
|
save_now=True,
|
|
|
@@ -1888,7 +2042,11 @@ class TestContentApi(DefaultTest):
|
|
1888
|
2042
|
config=self.app_config,
|
|
1889
|
2043
|
current_user=None,
|
|
1890
|
2044
|
)
|
|
1891
|
|
- group_api = GroupApi(current_user=None, session=self.session)
|
|
|
2045
|
+ group_api = GroupApi(
|
|
|
2046
|
+ current_user=None,
|
|
|
2047
|
+ session=self.session,
|
|
|
2048
|
+ config=self.app_config,
|
|
|
2049
|
+ )
|
|
1892
|
2050
|
groups = [group_api.get_one(Group.TIM_USER),
|
|
1893
|
2051
|
group_api.get_one(Group.TIM_MANAGER),
|
|
1894
|
2052
|
group_api.get_one(Group.TIM_ADMIN)]
|
|
|
@@ -1898,7 +2056,8 @@ class TestContentApi(DefaultTest):
|
|
1898
|
2056
|
|
|
1899
|
2057
|
workspace = WorkspaceApi(
|
|
1900
|
2058
|
current_user=user,
|
|
1901
|
|
- session=self.session
|
|
|
2059
|
+ session=self.session,
|
|
|
2060
|
+ config=self.app_config,
|
|
1902
|
2061
|
).create_workspace('test workspace', save_now=True)
|
|
1903
|
2062
|
|
|
1904
|
2063
|
api = ContentApi(
|
|
|
@@ -2032,6 +2191,7 @@ class TestContentApiSecurity(DefaultTest):
|
|
2032
|
2191
|
bob_workspace = WorkspaceApi(
|
|
2033
|
2192
|
current_user=bob,
|
|
2034
|
2193
|
session=self.session,
|
|
|
2194
|
+ config=self.app_config,
|
|
2035
|
2195
|
).create_workspace(
|
|
2036
|
2196
|
'bob_workspace',
|
|
2037
|
2197
|
save_now=True,
|
|
|
@@ -2039,6 +2199,7 @@ class TestContentApiSecurity(DefaultTest):
|
|
2039
|
2199
|
admin_workspace = WorkspaceApi(
|
|
2040
|
2200
|
current_user=admin,
|
|
2041
|
2201
|
session=self.session,
|
|
|
2202
|
+ config=self.app_config,
|
|
2042
|
2203
|
).create_workspace(
|
|
2043
|
2204
|
'admin_workspace',
|
|
2044
|
2205
|
save_now=True,
|