paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 22:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

casper: Use casper.then() more consistently in editing tests.

Browse Source 
Hopefully, this will fix the test flake problems we've been having
with this test since upgrading Casper.
This commit is contained in:
Tim Abbott
2017-11-20 15:54:47 -08:00
parent 0b543bfc0e
commit c7f47f5477
1 changed files with 47 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
frontend_tests/casper_tests/12-toggle-message-editing.js
View File

@@ -25,10 +25,12 @@ casper.then(function () {
}); });
// wait for message to be sent // wait for message to be sent
casper.waitFor(function () { casper.then(function () {
casper.waitFor(function () {
return casper.evaluate(function () { return casper.evaluate(function () {
return !current_msg_list.last().locally_echoed; return !current_msg_list.last().locally_echoed;
}); });
});
}); });
// edit the last message just sent // edit the last message just sent
@@ -42,12 +44,14 @@ casper.then(function () {
var edited_value = 'admin tests: test edit'; var edited_value = 'admin tests: test edit';
casper.waitUntilVisible(".message_edit_content", function () { casper.then(function () {
casper.waitUntilVisible(".message_edit_content", function () {
casper.evaluate(function (edited_value) { casper.evaluate(function (edited_value) {
var msg = $('#zhome .message_row:last'); var msg = $('#zhome .message_row:last');
msg.find('.message_edit_content').val(edited_value); msg.find('.message_edit_content').val(edited_value);
msg.find('.message_edit_save').click(); msg.find('.message_edit_save').click();
}, edited_value); }, edited_value);
});
}); });
casper.then(function () { casper.then(function () {
@@ -79,19 +83,20 @@ casper.then(function () {
casper.click('a[href^="#organization"]'); casper.click('a[href^="#organization"]');
}); });
casper.waitForSelector('#settings_overlay_container.show', function () { casper.then(function () {
casper.waitForSelector('#settings_overlay_container.show', function () {
casper.test.info('Organization page is active'); casper.test.info('Organization page is active');
casper.test.assertUrlMatch(/^http:\/\/[^/]+\/#organization/, 'URL suggests we are on organization page'); casper.test.assertUrlMatch(/^http:\/\/[^/]+\/#organization/, 'URL suggests we are on organization page');
});
}); });
casper.then(function () { casper.then(function () {
casper.click("li[data-section='organization-settings']"); casper.click("li[data-section='organization-settings']");
}); // deactivate "allow message editing"
casper.waitUntilVisible('input[type="checkbox"][id="id_realm_allow_message_editing"] + span', function () {
// deactivate "allow message editing"
casper.waitUntilVisible('input[type="checkbox"][id="id_realm_allow_message_editing"] + span', function () {
casper.click('input[type="checkbox"][id="id_realm_allow_message_editing"] + span'); casper.click('input[type="checkbox"][id="id_realm_allow_message_editing"] + span');
casper.click('form.org-settings-form button.button'); casper.click('form.org-settings-form button.button');
});
}); });
casper.then(function () { casper.then(function () {
@@ -152,11 +157,14 @@ casper.then(function () {
casper.click('a[href^="#organization"]'); casper.click('a[href^="#organization"]');
}); });
casper.waitUntilVisible("li[data-section='organization-settings']", function () { casper.then(function () {
casper.waitUntilVisible("li[data-section='organization-settings']", function () {
casper.click("li[data-section='organization-settings']"); casper.click("li[data-section='organization-settings']");
});
}); });
casper.waitUntilVisible('input[type="checkbox"][id="id_realm_allow_message_editing"] + span', function () { casper.then(function () {
casper.waitUntilVisible('input[type="checkbox"][id="id_realm_allow_message_editing"] + span', function () {
casper.click('input[type="checkbox"][id="id_realm_allow_message_editing"] + span'); casper.click('input[type="checkbox"][id="id_realm_allow_message_editing"] + span');
casper.click('form.org-settings-form button.button'); casper.click('form.org-settings-form button.button');
casper.waitUntilVisible('#admin-realm-message-editing-status', function () { casper.waitUntilVisible('#admin-realm-message-editing-status', function () {
@@ -165,6 +173,7 @@ casper.waitUntilVisible('input[type="checkbox"][id="id_realm_allow_message_editi
return document.querySelector('input[type="checkbox"][id="id_realm_allow_message_editing"]').checked; return document.querySelector('input[type="checkbox"][id="id_realm_allow_message_editing"]').checked;
}, 'Allow message editing Setting re-activated'); }, 'Allow message editing Setting re-activated');
}); });
});
}); });
// Commented out due to Issue #1243 // Commented out due to Issue #1243
@@ -210,15 +219,19 @@ casper.then(function () {
casper.test.assertExists('#settings_overlay_container.show', 'Organization page is active'); casper.test.assertExists('#settings_overlay_container.show', 'Organization page is active');
}); });
casper.waitUntilVisible('form.admin-realm-form button.button'); casper.then(function () {
casper.waitUntilVisible('form.admin-realm-form button.button');
});
// deactivate message editing // deactivate message editing
casper.waitUntilVisible('input[type="checkbox"][id="id_realm_allow_message_editing"] + span', function () { casper.then(function () {
casper.waitUntilVisible('input[type="checkbox"][id="id_realm_allow_message_editing"] + span', function () {
casper.evaluate(function () { casper.evaluate(function () {
$('input[type="text"][id="id_realm_message_content_edit_limit_minutes"]').val('4'); $('input[type="text"][id="id_realm_message_content_edit_limit_minutes"]').val('4');
}); });
casper.click('input[type="checkbox"][id="id_realm_allow_message_editing"] + span'); casper.click('input[type="checkbox"][id="id_realm_allow_message_editing"] + span');
casper.click('form.org-settings-form button.button'); casper.click('form.org-settings-form button.button');
});
}); });
casper.then(function () { casper.then(function () {