Admin processes test didnt seem to know about 'blocked' column. It does now. How...

diff --git a/HISTORY b/HISTORY
index 136f69a0f5d79a51dc2cff7b859e78cf4604dc7f..52c51bef9fb301bbe191a72d49a02d7861e62e63 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -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 b65974c299bcd7184e647b4a7daf60bb5f0f7b51..3b109cf02702fcef070f1bf9ab9db8707513ecfa 100644 (file)
--- 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 **/