From 1aac52d68581b24f8aaf604122630fc115bcb45f Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Thu, 9 Feb 2017 22:50:57 -0800 Subject: [PATCH] casper: Use waitUntilVisible in user deactivation tests. --- .../casper_tests/13-user-deactivation.js | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/frontend_tests/casper_tests/13-user-deactivation.js b/frontend_tests/casper_tests/13-user-deactivation.js index c9c88b86f4..c2c26b8197 100644 --- a/frontend_tests/casper_tests/13-user-deactivation.js +++ b/frontend_tests/casper_tests/13-user-deactivation.js @@ -11,14 +11,14 @@ casper.then(function () { }); casper.then(function () { - casper.waitForSelector('#settings_overlay_container.show', function () { + casper.waitUntilVisible('#settings_overlay_container.show', function () { casper.click("li[data-section='user-list-admin']"); }); }); // Test user deactivation and reactivation casper.then(function () { - casper.waitForSelector('.user_row[id="user_cordelia@zulip.com"]', function () { + casper.waitUntilVisible('.user_row[id="user_cordelia@zulip.com"]', function () { casper.test.assertSelectorHasText('.user_row[id="user_cordelia@zulip.com"]', 'Deactivate'); casper.click('.user_row[id="user_cordelia@zulip.com"] .deactivate'); casper.test.assertTextExists('Deactivate cordelia@zulip.com', 'Deactivate modal has right user'); @@ -28,21 +28,21 @@ casper.then(function () { }); casper.then(function () { - casper.waitForSelector('.user_row[id="user_cordelia@zulip.com"].deactivated_user', function () { + casper.waitUntilVisible('.user_row[id="user_cordelia@zulip.com"].deactivated_user', function () { casper.test.assertSelectorHasText('.user_row[id="user_cordelia@zulip.com"]', 'Reactivate'); casper.click('.user_row[id="user_cordelia@zulip.com"] .reactivate'); }); }); casper.then(function () { - casper.waitForSelector('.user_row[id="user_cordelia@zulip.com"]:not(.deactivated_user)', function () { + casper.waitUntilVisible('.user_row[id="user_cordelia@zulip.com"]:not(.deactivated_user)', function () { casper.test.assertSelectorHasText('.user_row[id="user_cordelia@zulip.com"]', 'Deactivate'); }); }); casper.then(function () { // Test Deactivated users section of admin page - casper.waitForSelector('.user_row[id="user_cordelia@zulip.com"]', function () { + casper.waitUntilVisible('.user_row[id="user_cordelia@zulip.com"]', function () { casper.test.assertSelectorHasText('.user_row[id="user_cordelia@zulip.com"]', 'Deactivate'); casper.click('.user_row[id="user_cordelia@zulip.com"] .deactivate'); casper.test.assertTextExists('Deactivate cordelia@zulip.com', 'Deactivate modal has right user'); @@ -62,14 +62,14 @@ casper.then(function () { casper.click("li[data-section='deactivated-users-admin']"); - casper.waitForSelector('#admin_deactivated_users_table .user_row[id="user_cordelia@zulip.com"] .reactivate', function () { + casper.waitUntilVisible('#admin_deactivated_users_table .user_row[id="user_cordelia@zulip.com"] .reactivate', function () { casper.test.assertSelectorHasText('#admin_deactivated_users_table .user_row[id="user_cordelia@zulip.com"]', 'Reactivate'); casper.click('#admin_deactivated_users_table .user_row[id="user_cordelia@zulip.com"] .reactivate'); }); }); casper.then(function () { - casper.waitForSelector('#admin_deactivated_users_table .user_row[id="user_cordelia@zulip.com"] button:not(.reactivate)', function () { + casper.waitUntilVisible('#admin_deactivated_users_table .user_row[id="user_cordelia@zulip.com"] button:not(.reactivate)', function () { casper.test.assertSelectorHasText('#admin_deactivated_users_table .user_row[id="user_cordelia@zulip.com"]', 'Deactivate'); }); }); @@ -81,21 +81,21 @@ casper.then(function () { }); casper.then(function () { - casper.waitForSelector('.user_row[id="user_new-user-bot@zulip.com"]', function () { + casper.waitUntilVisible('.user_row[id="user_new-user-bot@zulip.com"]', function () { casper.test.assertSelectorHasText('.user_row[id="user_new-user-bot@zulip.com"]', 'Deactivate'); casper.click('.user_row[id="user_new-user-bot@zulip.com"] .deactivate'); }); }); casper.then(function () { - casper.waitForSelector('.user_row[id="user_new-user-bot@zulip.com"].deactivated_user', function () { + casper.waitUntilVisible('.user_row[id="user_new-user-bot@zulip.com"].deactivated_user', function () { casper.test.assertSelectorHasText('.user_row[id="user_new-user-bot@zulip.com"]', 'Reactivate'); casper.click('.user_row[id="user_new-user-bot@zulip.com"] .reactivate'); }); }); casper.then(function () { - casper.waitForSelector('.user_row[id="user_new-user-bot@zulip.com"]:not(.deactivated_user)', function () { + casper.waitUntilVisible('.user_row[id="user_new-user-bot@zulip.com"]:not(.deactivated_user)', function () { casper.test.assertSelectorHasText('.user_row[id="user_new-user-bot@zulip.com"]', 'Deactivate'); }); });