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

org settings: Make each subsection independent for saving changes.

Browse Source 
This makes each subsection(like "Message feed") independent of changes
done in any other subsection and the save button of each subsection
saves the changes done in that subsection only.
This commit is contained in:
Shubham Dhama
2018-03-15 04:15:42 +05:30
committed by Tim Abbott
parent d0355f52cb
commit be0298314a
6 changed files with 139 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
frontend_tests/casper_tests/10-admin.js
View File

@@ -317,9 +317,6 @@ casper.then(function () {
});
});
function submit_org_settings_change() {
casper.click('form.org-settings-form button.button');
}
casper.then(function () {
casper.click("li[data-section='organization-settings']");
@@ -328,14 +325,15 @@ casper.then(function () {
casper.evaluate(function () {
$('#id_realm_default_language').val('de').change();
});
submit_org_settings_change();
casper.test.assertSelectorHasText('#org-submit-language-notify', "Save");
casper.click('#org-submit-language-notify');
});
});
casper.then(function () {
casper.waitUntilVisible('#admin-realm-default-language-status', function () {
casper.test.assertSelectorHasText('#admin-realm-default-language-status',
'Default language changed!');
casper.waitUntilVisible('#org-submit-language-notify[data-status="saved"]', function () {
casper.test.assertSelectorHasText('#org-submit-language-notify',
'Saved');
});
});

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

@@ -6,19 +6,10 @@ function heading(heading_str) {
});
}
function submit() {
// Casper 1.1.4 has a strange bug related to dispatching functions
// twice. We call save_organization_settings() to try to minimize
// the moving parts involved in troubleshooting.
casper.evaluate(function () {
settings_org.save_organization_settings();
});
}
function submit_checked() {
casper.then(function () {
casper.waitUntilVisible('input:checked[type="checkbox"][id="id_realm_allow_message_editing"] + span', function () {
submit();
casper.click('#org-submit-msg-editing');
});
});
}
@@ -26,7 +17,7 @@ function submit_checked() {
function submit_unchecked() {
casper.then(function () {
casper.waitUntilVisible('input:not(:checked)[type="checkbox"][id="id_realm_allow_message_editing"] + span', function () {
submit();
casper.click('#org-submit-msg-editing');
});
});
}
@@ -114,8 +105,9 @@ common.then_click('input[type="checkbox"][id="id_realm_allow_message_editing"] +
submit_unchecked();
casper.then(function () {
casper.waitUntilVisible('#admin-realm-message-editing-status', function () {
casper.test.assertSelectorHasText('#admin-realm-message-editing-status', 'Users can no longer edit their past messages!');
casper.waitUntilVisible('#org-submit-msg-editing[data-status="saved"]', function () {
casper.test.assertSelectorHasText('#org-submit-msg-editing',
'Saved');
casper.test.assertEval(function () {
return !(document.querySelector('input[type="checkbox"][id="id_realm_allow_message_editing"]').checked);
}, 'Allow message editing Setting de-activated');
@@ -167,8 +159,9 @@ common.then_click('input[type="checkbox"][id="id_realm_allow_message_editing"] +
submit_checked();
casper.then(function () {
casper.waitUntilVisible('#admin-realm-message-editing-status', function () {
casper.test.assertSelectorHasText('#admin-realm-message-editing-status', 'Users can now edit topics for all their messages, and the content of messages which are less than 10 minutes old.');
casper.waitUntilVisible('#org-submit-msg-editing[data-status="saved"]', function () {
casper.test.assertSelectorHasText('#org-submit-msg-editing',
'Saved');
casper.test.assertEval(function () {
return document.querySelector('input[type="checkbox"][id="id_realm_allow_message_editing"]').checked;
}, 'Allow message editing Setting re-activated');
@@ -204,8 +197,9 @@ common.then_click('input[type="checkbox"][id="id_realm_allow_message_editing"] +
submit_unchecked();
casper.then(function () {
casper.waitUntilVisible('#admin-realm-message-editing-status', function () {
casper.test.assertSelectorHasText('#admin-realm-message-editing-status', 'Users can no longer edit their past messages!');
casper.waitUntilVisible('#org-submit-msg-editing[data-status="saved"]', function () {
casper.test.assertSelectorHasText('#org-submit-msg-editing',
'Saved');
casper.test.assertEval(function () {
return !(document.querySelector('input[type="checkbox"][id="id_realm_allow_message_editing"]').checked);
}, 'Allow message editing Setting de-activated');
@@ -222,8 +216,9 @@ common.then_click('input[type="checkbox"][id="id_realm_allow_message_editing"] +
submit_checked();
casper.then(function () {
casper.waitUntilVisible('#admin-realm-message-editing-status', function () {
casper.test.assertSelectorHasText('#admin-realm-message-editing-status', 'Users can now edit topics for all their messages, and the content of messages which are less than 4 minutes old.');
casper.waitUntilVisible('#org-submit-msg-editing[data-status="saved"]', function () {
casper.test.assertSelectorHasText('#org-submit-msg-editing',
'Saved');
casper.test.assertEval(function () {
return document.querySelector('input[type="checkbox"][id="id_realm_allow_message_editing"]').checked;
}, 'Allow message editing Setting activated');
@@ -247,8 +242,9 @@ casper.then(function () {
submit_checked();
casper.then(function () {
casper.waitUntilVisible('#admin-realm-message-editing-status', function () {
casper.test.assertSelectorHasText('#admin-realm-message-editing-status', 'Users can now edit the content and topics of all their past messages!');
casper.waitUntilVisible('#org-submit-msg-editing[data-status="saved"]', function () {
casper.test.assertSelectorHasText('#org-submit-msg-editing',
'Saved');
casper.test.assertEval(function () {
return document.querySelector('input[type="checkbox"][id="id_realm_allow_message_editing"]').checked;
}, 'Allow message editing Setting still activated');
@@ -273,8 +269,9 @@ common.then_click('input[type="checkbox"][id="id_realm_allow_message_editing"] +
submit_unchecked();
casper.then(function () {
casper.waitUntilVisible('#admin-realm-message-editing-status', function () {
casper.test.assertSelectorHasText('#admin-realm-message-editing-status', 'Users can no longer edit their past messages!');
casper.waitUntilVisible('#org-submit-msg-editing[data-status="saved"]', function () {
casper.test.assertSelectorHasText('#org-submit-msg-editing',
'Saved');
casper.test.assertEval(function () {
return !(document.querySelector('input[type="checkbox"][id="id_realm_allow_message_editing"]').checked);
}, 'Allow message editing Setting de-activated');