diff options
author | Robert Treat | 2015-01-25 16:33:54 +0000 |
---|---|---|
committer | Robert Treat | 2015-01-25 16:33:54 +0000 |
commit | c9ee7c2e591d055e55b133ed4da470933e8124ce (patch) | |
tree | 53da39ada32cdf797e2f5a4f326c37867e5abbe7 | |
parent | 138e49734a0ac618992942008bf8524249df697a (diff) |
Admin processes test didnt seem to know about 'blocked' column. It does now. How did that ever work?
-rw-r--r-- | HISTORY | 1 | ||||
-rw-r--r-- | tests/selenium/src/12-admin.php | 13 |
2 files changed, 8 insertions, 6 deletions
@@ -12,6 +12,7 @@ Features Bugs * Fix bug in Turkish translation which caused failed ajax responses +* Account for Blocked field in admin processes Selenium test Incompatabilities * Dropped testing of 8.4, which is now EOL diff --git a/tests/selenium/src/12-admin.php b/tests/selenium/src/12-admin.php index b65974c2..3b109cf0 100644 --- a/tests/selenium/src/12-admin.php +++ b/tests/selenium/src/12-admin.php @@ -39,15 +39,16 @@ if ($t->data->major_version > 8.1) { $t->assertText("//tr/th[text()='{$lang['strusername']}' and @class='data']/../th[1]", $lang['strusername']); $t->assertText("//tr/th[text()='{$lang['strusername']}' and @class='data']/../th[2]", $lang['strprocess']); - $t->assertText("//tr/th[text()='{$lang['strusername']}' and @class='data']/../th[3]", $lang['strsql']); - $t->assertText("//tr/th[text()='{$lang['strusername']}' and @class='data']/../th[4]", $lang['strstarttime']); - $t->assertText("//tr/th[text()='{$lang['strusername']}' and @class='data']/../th[5]", $lang['stractions']); + $t->assertText("//tr/th[text()='{$lang['strusername']}' and @class='data']/../th[3]", $lang['strblocked']); + $t->assertText("//tr/th[text()='{$lang['strusername']}' and @class='data']/../th[4]", $lang['strsql']); + $t->assertText("//tr/th[text()='{$lang['strusername']}' and @class='data']/../th[5]", $lang['strstarttime']); + $t->assertText("//tr/th[text()='{$lang['strusername']}' and @class='data']/../th[6]", $lang['stractions']); $t->assertText("//tr[contains(@class,'data')]/td[text()='{$admin_user}']/../td[1]", $admin_user); /* this check is a bit fragile, since it relies on new line wrapping */ - $t->assertText('//tr[contains(@class,\'data\')]/td[3]/pre[@class=\'data\']', 'SELECT datname, usename, *FROM pg_catalog.pg_stat_activity*WHERE datname=\'ppatests_db\'*ORDER BY usename,*pid'); - $t->assertText("//tr[contains(@class,'data')]/td[text()='{$admin_user}']/../td[5]", $lang['strcancel']); + $t->assertText('//tr[contains(@class,\'data\')]/td[4]/pre[@class=\'data\']', 'SELECT datname, usename, *FROM pg_catalog.pg_stat_activity*WHERE datname=\'ppatests_db\'*ORDER BY usename,*pid'); + $t->assertText("//tr[contains(@class,'data')]/td[text()='{$admin_user}']/../td[6]", $lang['strcancel']); if ($t->data->hasQueryKill()) - $t->assertText("//tr[contains(@class,'data')]/td[text()='{$admin_user}']/../td[6]", $lang['strkill']); + $t->assertText("//tr[contains(@class,'data')]/td[text()='{$admin_user}']/../td[7]", $lang['strkill']); } /** 3 **/ |