@@ -21,7 +21,7 @@ def create_default_roles():
21
21
22
22
23
23
def assign_user_to_role (project_member , project , role_name ):
24
- role , created = Role .objects .get_or_create (name = role_name )
24
+ role , _ = Role .objects .get_or_create (name = role_name )
25
25
RoleMapping .objects .get_or_create (role_id = role .id , user_id = project_member .id , project_id = project .id )
26
26
27
27
@@ -49,9 +49,9 @@ def setUpTestData(cls):
49
49
password = cls .sub_project_member_pass )
50
50
approver = User .objects .create_user (username = cls .approver_name ,
51
51
password = cls .approver_pass )
52
- project_admin = User .objects .create_superuser (username = cls .super_user_name ,
53
- password = cls .super_user_pass ,
54
-
52
+ User .objects .create_superuser (username = cls .super_user_name ,
53
+ password = cls .super_user_pass ,
54
+
55
55
cls .main_project = mommy .make ('TextClassificationProject' , users = [main_project_member ])
56
56
cls .sub_project = mommy .make ('TextClassificationProject' , users = [sub_project_member ])
57
57
assign_user_to_role (project_member = main_project_member , project = cls .main_project ,
@@ -301,8 +301,7 @@ def setUpTestData(cls):
301
301
create_default_roles ()
302
302
project_member = User .objects .create_user (username = cls .project_member_name ,
303
303
password = cls .project_member_pass )
304
- non_project_member = User .objects .create_user (username = cls .non_project_member_name ,
305
- password = cls .non_project_member_pass )
304
+ User .objects .create_user (username = cls .non_project_member_name , password = cls .non_project_member_pass )
306
305
# Todo: change super_user to project_admin.
307
306
super_user = User .objects .create_superuser (username = cls .super_user_name ,
308
307
password = cls .super_user_pass ,
@@ -1415,7 +1414,7 @@ def setUpTestData(cls):
1415
1414
cls .other_project = mommy .make ('Project' , users = [cls .second_project_member , project_admin ])
1416
1415
cls .admin_role = Role .objects .get (name = settings .ROLE_PROJECT_ADMIN )
1417
1416
cls .role = mommy .make ('Role' , name = 'otherrole' )
1418
- rolemapping = mommy .make ('RoleMapping' , role = cls .admin_role , project = cls .main_project , user = project_admin )
1417
+ mommy .make ('RoleMapping' , role = cls .admin_role , project = cls .main_project , user = project_admin )
1419
1418
cls .data = {'user' : project_member .id , 'role' : cls .admin_role .id , 'project' : cls .main_project .id }
1420
1419
cls .other_url = reverse (viewname = 'rolemapping_list' , args = [cls .other_project .id ])
1421
1420
cls .url = reverse (viewname = 'rolemapping_list' , args = [cls .main_project .id ])
@@ -1460,8 +1459,7 @@ def setUpTestData(cls):
1460
1459
password = cls .project_admin_pass )
1461
1460
project_member = User .objects .create_user (username = cls .project_member_name ,
1462
1461
password = cls .project_member_pass )
1463
- non_project_member = User .objects .create_user (username = cls .non_project_member_name ,
1464
- password = cls .non_project_member_pass )
1462
+ User .objects .create_user (username = cls .non_project_member_name , password = cls .non_project_member_pass )
1465
1463
project = mommy .make ('Project' , users = [project_admin , project_member ])
1466
1464
admin_role = Role .objects .get (name = settings .ROLE_PROJECT_ADMIN )
1467
1465
annotator_role = Role .objects .get (name = settings .ROLE_ANNOTATOR )
0 commit comments