From 413c39aa232c078545fe58a53aebddc152a3340b Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 24 May 2019 12:20:10 +0100 Subject: Show field entries if error on add user form --- t/app/controller/admin/users.t | 1 + 1 file changed, 1 insertion(+) (limited to 't/app/controller/admin/users.t') diff --git a/t/app/controller/admin/users.t b/t/app/controller/admin/users.t index e2c922a23..767c8ef4c 100644 --- a/t/app/controller/admin/users.t +++ b/t/app/controller/admin/users.t @@ -157,6 +157,7 @@ for my $test ( subtest $test->{desc} => sub { $mech->get_ok('/admin/users'); $mech->submit_form_ok( { with_fields => $test->{fields} } ); + $mech->content_contains('Norman') if $test->{fields}{name}; if ($test->{error}) { $mech->content_contains($_) for @{$test->{error}}; } else { -- cgit v1.2.3 From e06e3debd37f8d10a9d2ef5aacfa5dbc7696574b Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 17 May 2019 13:26:17 +0100 Subject: Add role search to users page. --- t/app/controller/admin/users.t | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 't/app/controller/admin/users.t') diff --git a/t/app/controller/admin/users.t b/t/app/controller/admin/users.t index 767c8ef4c..534034f1d 100644 --- a/t/app/controller/admin/users.t +++ b/t/app/controller/admin/users.t @@ -60,6 +60,7 @@ subtest 'show flagged entries' => sub { $user->update; }; +my $role; subtest 'user search' => sub { $mech->get_ok('/admin/users'); $mech->get_ok('/admin/users?search=' . $user->name); @@ -74,8 +75,17 @@ subtest 'user search' => sub { $user->from_body($haringey->id); $user->update; + $role = $user->roles->create({ + body => $haringey, + name => 'Role A', + permissions => ['moderate', 'user_edit'], + }); + $user->add_to_roles($role); $mech->get_ok('/admin/users?search=' . $haringey->id ); - $mech->content_contains('Haringey'); + $mech->content_contains('test@example.com'); + $mech->get_ok('/admin/users?role=' . $role->id); + $mech->content_contains('selected>Role A'); + $mech->content_contains('test@example.com'); }; subtest 'search does not show user from another council' => sub { @@ -167,7 +177,7 @@ for my $test ( } my %default_perms = ( - "permissions[moderate]" => undef, + "permissions[moderate]" => 'on', "permissions[planned_reports]" => undef, "permissions[report_mark_private]" => undef, "permissions[report_edit]" => undef, @@ -181,7 +191,7 @@ my %default_perms = ( "permissions[contribute_as_body]" => undef, "permissions[default_to_body]" => undef, "permissions[view_body_contribute_details]" => undef, - "permissions[user_edit]" => undef, + "permissions[user_edit]" => 'on', "permissions[user_manage_permissions]" => undef, "permissions[user_assign_body]" => undef, "permissions[user_assign_areas]" => undef, @@ -212,6 +222,7 @@ FixMyStreet::override_config { is_superuser => undef, area_ids => undef, %default_perms, + roles => $role->id, }, changes => { name => 'Changed User', @@ -232,6 +243,7 @@ FixMyStreet::override_config { is_superuser => undef, area_ids => undef, %default_perms, + roles => $role->id, }, changes => { email => 'changed@example.com', @@ -252,10 +264,14 @@ FixMyStreet::override_config { is_superuser => undef, area_ids => undef, %default_perms, + roles => $role->id, }, changes => { body => $southend->id, }, + removed => [ + 'roles', + ], log_count => 3, log_entries => [qw/edit edit edit/], }, @@ -340,6 +356,8 @@ FixMyStreet::override_config { }, added => { %default_perms, + 'permissions[moderate]' => undef, + 'permissions[user_edit]' => undef, }, log_count => 5, log_entries => [qw/edit edit edit edit edit/], -- cgit v1.2.3 From 4b88125da243aba9ad9754619c53cd5c50512c6d Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 24 May 2019 12:43:23 +0100 Subject: Add role to users from admin user list page. --- t/app/controller/admin/users.t | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 't/app/controller/admin/users.t') diff --git a/t/app/controller/admin/users.t b/t/app/controller/admin/users.t index 534034f1d..ce29a5f7c 100644 --- a/t/app/controller/admin/users.t +++ b/t/app/controller/admin/users.t @@ -88,6 +88,14 @@ subtest 'user search' => sub { $mech->content_contains('test@example.com'); }; +subtest 'user assign role' => sub { + $user->remove_from_roles($role); + is $user->roles->count, 0; + $mech->get_ok('/admin/users'); + $mech->submit_form_ok({ with_fields => { uid => $user->id, roles => $role->id } }); + is $user->roles->count, 1; +}; + subtest 'search does not show user from another council' => sub { FixMyStreet::override_config { ALLOWED_COBRANDS => [ 'oxfordshire' ], -- cgit v1.2.3