From bdf67f76290f43cd9ea22a872d6db86c272343d5 Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Wed, 31 Aug 2016 18:59:48 -0400 Subject: - Selenium test script fixes to work with recent email/login changes --- xt/selenium/bug_edit.t | 4 ++-- xt/selenium/create_user_accounts.t | 12 ++++++------ xt/selenium/custom_fields.t | 1 + xt/selenium/password_complexity.t | 2 +- xt/selenium/security.t | 2 +- xt/selenium/strict_isolation.t | 4 ++-- xt/selenium/sudo_sessions.t | 8 ++++---- xt/selenium/user_groups.t | 8 ++++---- xt/selenium/user_matching.t | 4 ++-- 9 files changed, 23 insertions(+), 22 deletions(-) diff --git a/xt/selenium/bug_edit.t b/xt/selenium/bug_edit.t index 10bab3fe0..16ddd58ac 100644 --- a/xt/selenium/bug_edit.t +++ b/xt/selenium/bug_edit.t @@ -249,8 +249,8 @@ $sel->wait_for_page_to_load_ok(WAIT_TIME); $sel->title_is("Full Text Bug Listing"); $sel->is_text_present_ok("Bug $bug1_id"); $sel->is_text_present_ok("Status: CONFIRMED"); -$sel->is_text_present_ok("Reporter: QA-Selenium-TEST <$config->{QA_Selenium_TEST_user_login}>"); -$sel->is_text_present_ok("Assignee: admin <$config->{admin_user_login}>"); +$sel->is_text_present_ok("Reporter: QA-Selenium-TEST ($config->{QA_Selenium_TEST_user_login})"); +$sel->is_text_present_ok("Assignee: admin ($config->{admin_user_login})"); $sel->is_text_present_ok("Severity: blocker"); $sel->is_text_present_ok("Priority: Highest"); $sel->is_text_present_ok("I have no privs, I can only comment"); diff --git a/xt/selenium/create_user_accounts.t b/xt/selenium/create_user_accounts.t index 8bb888fe8..8c19a1882 100644 --- a/xt/selenium/create_user_accounts.t +++ b/xt/selenium/create_user_accounts.t @@ -35,7 +35,7 @@ $sel->is_text_present_ok("Open a New Account"); $sel->click_ok("link=Open a New Account"); $sel->wait_for_page_to_load_ok(WAIT_TIME); $sel->title_is("Create a new Bugzilla account"); -$sel->type_ok("login", $valid_account); +$sel->type_ok("email", $valid_account); $sel->click_ok("send"); $sel->wait_for_page_to_load_ok(WAIT_TIME); $sel->title_is("Request for new user account '$valid_account' submitted"); @@ -49,7 +49,7 @@ $sel->is_text_present_ok("Open a New Account"); $sel->click_ok("link=Open a New Account"); $sel->wait_for_page_to_load_ok(WAIT_TIME); $sel->title_is("Create a new Bugzilla account"); -$sel->type_ok("login", $valid_account); +$sel->type_ok("email", $valid_account); $sel->click_ok("send"); $sel->wait_for_page_to_load_ok(WAIT_TIME); $sel->title_is("Too Soon For New Token"); @@ -62,7 +62,7 @@ foreach my $account (@accounts) { $sel->click_ok("link=New Account"); $sel->wait_for_page_to_load_ok(WAIT_TIME); $sel->title_is("Create a new Bugzilla account"); - $sel->type_ok("login", $account); + $sel->type_ok("email", $account); $sel->click_ok("send"); $sel->wait_for_page_to_load_ok(WAIT_TIME); $sel->title_is("Account Creation Restricted"); @@ -85,7 +85,7 @@ foreach my $account (@accounts) { document.getElementById('account_creation_form').setAttribute('novalidate', 1); }; $sel->run_script($script); - $sel->type_ok("login", $account); + $sel->type_ok("email", $account); $sel->click_ok("send"); $sel->wait_for_page_to_load_ok(WAIT_TIME); $sel->title_is("Invalid Email Address"); @@ -97,12 +97,12 @@ foreach my $account (@accounts) { $sel->click_ok("link=New Account"); $sel->wait_for_page_to_load_ok(WAIT_TIME); $sel->title_is("Create a new Bugzilla account"); -$sel->type_ok("login", $config->{admin_user_login}); +$sel->type_ok("email", $config->{admin_user_login}); $sel->click_ok("send"); $sel->wait_for_page_to_load_ok(WAIT_TIME); $sel->title_is("Account Already Exists"); $error_msg = trim($sel->get_text("error_msg")); -ok($error_msg eq "There is already an account with the login name $config->{admin_user_login}.", "Account already exists"); +ok($error_msg eq "There is already an account with the email address $config->{admin_user_login}.", "Account already exists"); # Turn off user account creation. log_in($sel, $config, 'admin'); diff --git a/xt/selenium/custom_fields.t b/xt/selenium/custom_fields.t index 503612d02..d477ace3b 100644 --- a/xt/selenium/custom_fields.t +++ b/xt/selenium/custom_fields.t @@ -58,6 +58,7 @@ $sel->select_ok("type", "label=Drop Down"); $sel->type_ok("sortkey", $bug1_id); $sel->click_ok("enter_bug"); $sel->value_is("enter_bug", "on"); +sleep(3); $sel->click_ok("new_bugmail"); $sel->value_is("new_bugmail", "on"); $sel->value_is("obsolete", "off"); diff --git a/xt/selenium/password_complexity.t b/xt/selenium/password_complexity.t index 8c019639d..f8ea02988 100644 --- a/xt/selenium/password_complexity.t +++ b/xt/selenium/password_complexity.t @@ -60,7 +60,7 @@ sub check_passwords { $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', $new_user); + $sel->type_ok('email', $new_user); foreach my $password (@$invalid_passwords) { $sel->type_ok('password', $password, 'Enter password'); diff --git a/xt/selenium/security.t b/xt/selenium/security.t index 9c15e0464..c65b4c07b 100644 --- a/xt/selenium/security.t +++ b/xt/selenium/security.t @@ -123,7 +123,7 @@ foreach my $arg (@args) { $sel->title_is("Suspicious Action"); if ($arg eq "token=$admin_cookie") { - $sel->is_text_present_ok("Generated by: admin <$admin_user>"); + $sel->is_text_present_ok("Generated by: admin ($admin_user)"); $sel->is_text_present_ok("This token has not been generated by you"); } else { diff --git a/xt/selenium/strict_isolation.t b/xt/selenium/strict_isolation.t index 575966738..a0400bbac 100644 --- a/xt/selenium/strict_isolation.t +++ b/xt/selenium/strict_isolation.t @@ -90,7 +90,7 @@ $sel->type_ok("matchstr", $qa_user); $sel->select_ok("matchtype", "label=exact (find this user)"); $sel->click_ok("search"); $sel->wait_for_page_to_load_ok(WAIT_TIME); -$sel->title_is("Edit user QA-Selenium-TEST <$qa_user>"); +$sel->title_is("Edit user QA-Selenium-TEST ($qa_user)"); $sel->check_ok("group_$master_gid"); $sel->click_ok("update"); $sel->wait_for_page_to_load_ok(WAIT_TIME); @@ -128,7 +128,7 @@ $sel->type_ok("matchstr", $qa_user); $sel->select_ok("matchtype", "label=exact (find this user)"); $sel->click_ok("search"); $sel->wait_for_page_to_load_ok(WAIT_TIME); -$sel->title_is("Edit user QA-Selenium-TEST <$qa_user>"); +$sel->title_is("Edit user QA-Selenium-TEST ($qa_user)"); $sel->uncheck_ok("group_$master_gid"); $sel->click_ok("update"); $sel->wait_for_page_to_load_ok(WAIT_TIME); diff --git a/xt/selenium/sudo_sessions.t b/xt/selenium/sudo_sessions.t index f599986ce..99a6c653a 100644 --- a/xt/selenium/sudo_sessions.t +++ b/xt/selenium/sudo_sessions.t @@ -35,8 +35,8 @@ $sel->type_ok("matchstr", $config->{unprivileged_user_login}); $sel->select_ok("matchtype", "label=exact (find this user)"); $sel->click_ok("search"); $sel->wait_for_page_to_load_ok(WAIT_TIME); -$sel->title_is("Edit user no-privs <$config->{unprivileged_user_login}>"); -$sel->value_is("login", $config->{unprivileged_user_login}); +$sel->title_is("Edit user no-privs ($config->{unprivileged_user_login})"); +$sel->value_is("email", $config->{unprivileged_user_login}); $sel->click_ok("link=Impersonate this user"); $sel->wait_for_page_to_load_ok(WAIT_TIME); $sel->title_is("Begin sudo session"); @@ -64,8 +64,8 @@ $sel->type_ok("matchstr", $config->{unprivileged_user_login}); $sel->select_ok("matchtype", "label=exact (find this user)"); $sel->click_ok("search"); $sel->wait_for_page_to_load_ok(WAIT_TIME); -$sel->title_is("Edit user no-privs <$config->{unprivileged_user_login}>"); -$sel->value_is("login", $config->{unprivileged_user_login}); +$sel->title_is("Edit user no-privs ($config->{unprivileged_user_login})"); +$sel->value_is("email", $config->{unprivileged_user_login}); $sel->click_ok("link=Impersonate this user"); $sel->wait_for_page_to_load_ok(WAIT_TIME); $sel->title_is("Begin sudo session"); diff --git a/xt/selenium/user_groups.t b/xt/selenium/user_groups.t index ef907f68c..563dcd6b7 100644 --- a/xt/selenium/user_groups.t +++ b/xt/selenium/user_groups.t @@ -67,7 +67,7 @@ $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('email', 'master@selenium.bugzilla.org'); $sel->type_ok('name', 'master-user'); $sel->type_ok('password', 'selenium', 'Enter password'); $sel->type_ok('disabledtext', 'Not for common usage'); @@ -83,7 +83,7 @@ $sel->is_text_present_ok('The account has been added to the Master group'); $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', 'slave@selenium.bugzilla.org'); +$sel->type_ok('email', 'slave@selenium.bugzilla.org'); $sel->type_ok('name', 'slave-user'); $sel->type_ok('password', 'selenium', 'Enter password'); $sel->type_ok('disabledtext', 'Not for common usage'); @@ -99,7 +99,7 @@ $sel->is_text_present_ok('The account has been added to the Slave group'); $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', 'reg@selenium.bugzilla.org'); +$sel->type_ok('email', 'reg@selenium.bugzilla.org'); $sel->type_ok('name', 'reg-user'); $sel->type_ok('password', 'selenium', 'Enter password'); $sel->type_ok('disabledtext', 'Not for common usage'); @@ -216,7 +216,7 @@ sub cleanup_users { $sel->click_ok("link=$login"); $sel->wait_for_page_to_load_ok(WAIT_TIME); - $sel->title_is("Edit user ${user}-user <$login>"); + $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"); diff --git a/xt/selenium/user_matching.t b/xt/selenium/user_matching.t index 54afe08b2..26b9e009e 100644 --- a/xt/selenium/user_matching.t +++ b/xt/selenium/user_matching.t @@ -61,7 +61,7 @@ $sel->type_ok("newcc", "$config->{unprivileged_user_login_truncated}*"); $sel->click_ok("commit"); $sel->wait_for_page_to_load_ok(WAIT_TIME); $sel->title_is("Confirm Match"); -$sel->is_text_present_ok("<$config->{unprivileged_user_login}>"); +$sel->is_text_present_ok("($config->{unprivileged_user_login})"); $sel->go_back_ok(); $sel->wait_for_page_to_load_ok(WAIT_TIME); $sel->title_like(qr/^$bug1_id/); @@ -164,7 +164,7 @@ $sel->type_ok("newcc", $config->{tweakparams_user_login_truncated}); $sel->click_ok("commit"); $sel->wait_for_page_to_load_ok(WAIT_TIME); $sel->title_is("Confirm Match"); -$sel->is_text_present_ok("<$config->{tweakparams_user_login}>"); +$sel->is_text_present_ok("($config->{tweakparams_user_login})"); # Now test user menus. It must NOT display users we are not allowed to see. -- cgit v1.2.3-24-g4f1b