From 8ec8da0491ad89604700b3e29a227966f6d84ba1 Mon Sep 17 00:00:00 2001 From: Perl Tidy Date: Wed, 5 Dec 2018 15:38:52 -0500 Subject: no bug - reformat all the code using the new perltidy rules --- qa/t/test_user_groups.t | 155 ++++++++++++++++++++++++++---------------------- 1 file changed, 85 insertions(+), 70 deletions(-) (limited to 'qa/t/test_user_groups.t') diff --git a/qa/t/test_user_groups.t b/qa/t/test_user_groups.t index 0798a1b80..bc3f2e500 100644 --- a/qa/t/test_user_groups.t +++ b/qa/t/test_user_groups.t @@ -17,7 +17,8 @@ use constant PASSWORD => 'uChoopoh1che'; my ($sel, $config) = get_selenium(); log_in($sel, $config, 'admin'); -set_parameters($sel, { "Administrative Policies" => {"allowuserdeletion-on" => undef} }); +set_parameters($sel, + {"Administrative Policies" => {"allowuserdeletion-on" => undef}}); # First delete test users, if not deleted correctly during a previous run. @@ -44,7 +45,8 @@ $sel->click_ok("link=Add Group"); $sel->wait_for_page_to_load_ok(WAIT_TIME); $sel->title_is("Add group"); $sel->type_ok("name", "Slave"); -$sel->type_ok("desc", "Members of the Master group are also members of this group"); +$sel->type_ok("desc", + "Members of the Master group are also members of this group"); $sel->type_ok("owner", $config->{'admin_user_login'}); $sel->uncheck_ok("isactive"); ok(!$sel->is_checked("insertnew"), "Group not added to products by default"); @@ -66,9 +68,9 @@ $sel->title_is('Search users'); $sel->click_ok('link=add a new user'); $sel->wait_for_page_to_load_ok(WAIT_TIME); $sel->title_is('Add user'); -$sel->type_ok('login', 'master@selenium.bugzilla.org'); -$sel->type_ok('name', 'master-user'); -$sel->type_ok('password', PASSWORD, 'Enter password'); +$sel->type_ok('login', 'master@selenium.bugzilla.org'); +$sel->type_ok('name', 'master-user'); +$sel->type_ok('password', PASSWORD, 'Enter password'); $sel->type_ok('disabledtext', 'Not for common usage'); $sel->click_ok('add'); $sel->wait_for_page_to_load_ok(WAIT_TIME); @@ -82,9 +84,9 @@ $sel->is_text_present_ok('The account has been added to the Master group'); $sel->click_ok("//a[contains(text(),'add\n a new user')]"); $sel->wait_for_page_to_load_ok(WAIT_TIME); $sel->title_is('Add user'); -$sel->type_ok('login', 'slave@selenium.bugzilla.org'); -$sel->type_ok('name', 'slave-user'); -$sel->type_ok('password', PASSWORD, 'Enter password'); +$sel->type_ok('login', 'slave@selenium.bugzilla.org'); +$sel->type_ok('name', 'slave-user'); +$sel->type_ok('password', PASSWORD, 'Enter password'); $sel->type_ok('disabledtext', 'Not for common usage'); $sel->click_ok('add'); $sel->wait_for_page_to_load_ok(WAIT_TIME); @@ -98,9 +100,9 @@ $sel->is_text_present_ok('The account has been added to the Slave group'); $sel->click_ok("//a[contains(text(),'add\n a new user')]"); $sel->wait_for_page_to_load_ok(WAIT_TIME); $sel->title_is('Add user'); -$sel->type_ok('login', 'reg@selenium.bugzilla.org'); -$sel->type_ok('name', 'reg-user'); -$sel->type_ok('password', PASSWORD, 'Enter password'); +$sel->type_ok('login', 'reg@selenium.bugzilla.org'); +$sel->type_ok('name', 'reg-user'); +$sel->type_ok('password', PASSWORD, 'Enter password'); $sel->type_ok('disabledtext', 'Not for common usage'); $sel->click_ok('add'); $sel->wait_for_page_to_load_ok(WAIT_TIME); @@ -112,25 +114,31 @@ $sel->click_ok('link=find other users'); $sel->wait_for_page_to_load_ok(WAIT_TIME); $sel->title_is('Search users'); $sel->check_ok('grouprestrict'); -$sel->select_ok('groupid', 'label=Master'); +$sel->select_ok('groupid', 'label=Master'); $sel->select_ok('matchtype', 'value=substr'); $sel->click_ok('search'); $sel->wait_for_page_to_load_ok(WAIT_TIME); -$sel->is_text_present_ok('master@selenium.bugzilla.org', 'master-user in Master group'); -ok(!$sel->is_text_present('slave@selenium.bugzilla.org'), 'slave-user not in Master group'); -ok(!$sel->is_text_present('reg@selenium.bugzilla.org'), 'reg-user not in Master group'); +$sel->is_text_present_ok('master@selenium.bugzilla.org', + 'master-user in Master group'); +ok(!$sel->is_text_present('slave@selenium.bugzilla.org'), + 'slave-user not in Master group'); +ok(!$sel->is_text_present('reg@selenium.bugzilla.org'), + 'reg-user not in Master group'); $sel->click_ok('link=find other users'); $sel->wait_for_page_to_load_ok(WAIT_TIME); $sel->title_is('Search users'); $sel->check_ok('grouprestrict'); -$sel->select_ok('groupid', 'label=Slave'); +$sel->select_ok('groupid', 'label=Slave'); $sel->select_ok('matchtype', 'value=substr'); $sel->click_ok('search'); $sel->wait_for_page_to_load_ok(WAIT_TIME); -$sel->is_text_present_ok('master@selenium.bugzilla.org', 'master-user in Slave group'); -$sel->is_text_present_ok('slave@selenium.bugzilla.org', 'slave-user in Slave group'); -ok(!$sel->is_text_present('reg@selenium.bugzilla.org'), 'reg-user not in Slave group'); +$sel->is_text_present_ok('master@selenium.bugzilla.org', + 'master-user in Slave group'); +$sel->is_text_present_ok('slave@selenium.bugzilla.org', + 'slave-user in Slave group'); +ok(!$sel->is_text_present('reg@selenium.bugzilla.org'), + 'reg-user not in Slave group'); # Add a regular expression to the Slave group. @@ -153,25 +161,31 @@ $sel->click_ok("link=Users"); $sel->wait_for_page_to_load_ok(WAIT_TIME); $sel->title_is('Search users'); $sel->check_ok('grouprestrict'); -$sel->select_ok('groupid', 'label=Master'); +$sel->select_ok('groupid', 'label=Master'); $sel->select_ok('matchtype', 'value=substr'); $sel->click_ok('search'); $sel->wait_for_page_to_load_ok(WAIT_TIME); -$sel->is_text_present_ok('master@selenium.bugzilla.org', 'master-user in Master group'); -ok(!$sel->is_text_present('slave@selenium.bugzilla.org'), 'slave-user not in Master group'); -ok(!$sel->is_text_present('reg@selenium.bugzilla.org'), 'reg-user not in Master group'); +$sel->is_text_present_ok('master@selenium.bugzilla.org', + 'master-user in Master group'); +ok(!$sel->is_text_present('slave@selenium.bugzilla.org'), + 'slave-user not in Master group'); +ok(!$sel->is_text_present('reg@selenium.bugzilla.org'), + 'reg-user not in Master group'); $sel->click_ok('link=find other users'); $sel->wait_for_page_to_load_ok(WAIT_TIME); $sel->title_is('Search users'); $sel->check_ok('grouprestrict'); -$sel->select_ok('groupid', 'label=Slave'); +$sel->select_ok('groupid', 'label=Slave'); $sel->select_ok('matchtype', 'value=substr'); $sel->click_ok('search'); $sel->wait_for_page_to_load_ok(WAIT_TIME); -$sel->is_text_present_ok('master@selenium.bugzilla.org', 'master-user in Slave group'); -$sel->is_text_present_ok('slave@selenium.bugzilla.org', 'slave-user in Slave group'); -$sel->is_text_present_ok('reg@selenium.bugzilla.org', 'reg-user in Slave group'); +$sel->is_text_present_ok('master@selenium.bugzilla.org', + 'master-user in Slave group'); +$sel->is_text_present_ok('slave@selenium.bugzilla.org', + 'slave-user in Slave group'); +$sel->is_text_present_ok('reg@selenium.bugzilla.org', + 'reg-user in Slave group'); # Remove created users and groups. @@ -180,52 +194,53 @@ cleanup_groups($sel, $slave_gid); logout($sel); sub cleanup_users { - my $sel = shift; - - go_to_admin($sel); - $sel->click_ok("link=Users"); + my $sel = shift; + + go_to_admin($sel); + $sel->click_ok("link=Users"); + $sel->wait_for_page_to_load_ok(WAIT_TIME); + $sel->title_is("Search users"); + $sel->type_ok('matchstr', '(master|slave|reg)@selenium.bugzilla.org'); + $sel->select_ok('matchtype', 'value=regexp'); + $sel->click_ok("search"); + $sel->wait_for_page_to_load_ok(WAIT_TIME); + $sel->title_is("Select user"); + + foreach my $user ('master', 'slave', 'reg') { + my $login = $user . '@selenium.bugzilla.org'; + next unless $sel->is_text_present($login); + + $sel->click_ok("link=$login"); + $sel->wait_for_page_to_load_ok(WAIT_TIME); + $sel->title_is("Edit user ${user}-user <$login>"); + $sel->click_ok("delete"); $sel->wait_for_page_to_load_ok(WAIT_TIME); - $sel->title_is("Search users"); - $sel->type_ok('matchstr', '(master|slave|reg)@selenium.bugzilla.org'); - $sel->select_ok('matchtype', 'value=regexp'); - $sel->click_ok("search"); + $sel->title_is("Confirm deletion of user $login"); + ok(!$sel->is_text_present('You cannot delete this user account'), + 'The user can be safely deleted'); + $sel->click_ok("delete"); + $sel->wait_for_page_to_load_ok(WAIT_TIME); + $sel->title_is("User $login deleted"); + $sel->click_ok('link=show the user list again'); $sel->wait_for_page_to_load_ok(WAIT_TIME); - $sel->title_is("Select user"); - - foreach my $user ('master', 'slave', 'reg') { - my $login = $user . '@selenium.bugzilla.org'; - next unless $sel->is_text_present($login); - - $sel->click_ok("link=$login"); - $sel->wait_for_page_to_load_ok(WAIT_TIME); - $sel->title_is("Edit user ${user}-user <$login>"); - $sel->click_ok("delete"); - $sel->wait_for_page_to_load_ok(WAIT_TIME); - $sel->title_is("Confirm deletion of user $login"); - ok(!$sel->is_text_present('You cannot delete this user account'), 'The user can be safely deleted'); - $sel->click_ok("delete"); - $sel->wait_for_page_to_load_ok(WAIT_TIME); - $sel->title_is("User $login deleted"); - $sel->click_ok('link=show the user list again'); - $sel->wait_for_page_to_load_ok(WAIT_TIME); - $sel->title_is('Select user'); - } + $sel->title_is('Select user'); + } } sub cleanup_groups { - my ($sel, $slave_gid) = @_; - - go_to_admin($sel); - $sel->click_ok("link=Groups"); - $sel->wait_for_page_to_load(WAIT_TIME); - $sel->title_is("Edit Groups"); - $sel->click_ok("//a[\@href='editgroups.cgi?action=del&group=$slave_gid']"); - $sel->wait_for_page_to_load(WAIT_TIME); - $sel->title_is("Delete group"); - $sel->is_text_present_ok("Do you really want to delete this group?"); - ok(!$sel->is_element_present("removeusers"), 'No direct members in this group'); - $sel->click_ok("delete"); - $sel->wait_for_page_to_load(WAIT_TIME); - $sel->title_is("Group Deleted"); - $sel->is_text_present_ok("The group Slave has been deleted."); + my ($sel, $slave_gid) = @_; + + go_to_admin($sel); + $sel->click_ok("link=Groups"); + $sel->wait_for_page_to_load(WAIT_TIME); + $sel->title_is("Edit Groups"); + $sel->click_ok("//a[\@href='editgroups.cgi?action=del&group=$slave_gid']"); + $sel->wait_for_page_to_load(WAIT_TIME); + $sel->title_is("Delete group"); + $sel->is_text_present_ok("Do you really want to delete this group?"); + ok(!$sel->is_element_present("removeusers"), 'No direct members in this group'); + $sel->click_ok("delete"); + $sel->wait_for_page_to_load(WAIT_TIME); + $sel->title_is("Group Deleted"); + $sel->is_text_present_ok("The group Slave has been deleted."); } -- cgit v1.2.3-24-g4f1b