diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2019-02-15 13:38:53 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2019-02-15 13:38:53 +0000 |
| commit | 558438e9750a29d98584edf345366a23ca0b2092 (patch) | |
| tree | e1952b344fbccff5c9db448b6e28004c180c7a3c /t/app/controller/admin | |
| parent | 0d1ee3b9b219c25529e4232ce2b93f1079496e25 (diff) | |
| parent | c2089e945132d36468f1d9a3bf08ae4d661cf44a (diff) | |
Merge branch 'issues/commercial/1270-user-areas'
Diffstat (limited to 't/app/controller/admin')
| -rw-r--r-- | t/app/controller/admin/permissions.t | 4 | ||||
| -rw-r--r-- | t/app/controller/admin/users.t | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/t/app/controller/admin/permissions.t b/t/app/controller/admin/permissions.t index 3fc221a63..036ec4509 100644 --- a/t/app/controller/admin/permissions.t +++ b/t/app/controller/admin/permissions.t @@ -181,6 +181,7 @@ FixMyStreet::override_config { subtest "Unsetting user from_body removes all permissions and area " => sub { is $user2->user_body_permissions->count, 1, 'user2 has 1 permission'; + $user2->update({ area_ids => [123] }); # Set to check cleared $mech->get_ok("/admin/user_edit/$user2_id"); $mech->content_contains('Moderate report details'); @@ -204,8 +205,9 @@ FixMyStreet::override_config { "permissions[user_assign_areas]" => undef, } } ); + $user2->discard_changes; is $user2->user_body_permissions->count, 0, 'user2 has had permissions removed'; - is $user2->area_id, undef, 'user2 has had area removed'; + is $user2->area_ids, undef, 'user2 has had area removed'; }; }; diff --git a/t/app/controller/admin/users.t b/t/app/controller/admin/users.t index be781d3ae..d82a7eaef 100644 --- a/t/app/controller/admin/users.t +++ b/t/app/controller/admin/users.t @@ -209,7 +209,7 @@ FixMyStreet::override_config { phone_verified => undef, flagged => undef, is_superuser => undef, - area_id => '', + area_ids => undef, %default_perms, }, changes => { @@ -229,7 +229,7 @@ FixMyStreet::override_config { phone_verified => undef, flagged => undef, is_superuser => undef, - area_id => '', + area_ids => undef, %default_perms, }, changes => { @@ -249,7 +249,7 @@ FixMyStreet::override_config { phone_verified => undef, flagged => undef, is_superuser => undef, - area_id => '', + area_ids => undef, %default_perms, }, changes => { @@ -269,7 +269,7 @@ FixMyStreet::override_config { phone_verified => undef, flagged => undef, is_superuser => undef, - area_id => '', + area_ids => undef, %default_perms, }, changes => { @@ -289,7 +289,7 @@ FixMyStreet::override_config { phone_verified => undef, flagged => 'on', is_superuser => undef, - area_id => '', + area_ids => undef, %default_perms, }, changes => { @@ -309,7 +309,7 @@ FixMyStreet::override_config { phone_verified => undef, flagged => undef, is_superuser => undef, - area_id => '', + area_ids => undef, %default_perms, }, changes => { @@ -332,7 +332,7 @@ FixMyStreet::override_config { phone_verified => undef, flagged => undef, is_superuser => 'on', - area_id => '', + area_ids => undef, }, changes => { is_superuser => undef, |