reverted_ looking for settings_text

pull/1077/head
Vincent 5 years ago
parent b046a9c292
commit f7f4cc5218

@ -12,7 +12,8 @@ const common = require('./common');
// require('./add_friends_test');
// require('./link_device_test');
// require('./closed_group_test');
require('./message_functions_test');
// require('./message_functions_test');
require('./settings_test');
before(async () => {

@ -0,0 +1,11 @@
module.exports = {
// settings view
leftPaneSettingsButton: `//*[contains(@class,"session-icon-button") and .//*[contains(@class, "gear")]]`,
settingToggleWithText: text => `//div[contains(@class, 'session-settings-item') and contains(string(), '${text}')]//*[contains(@class, 'session-toggle')]`,
settingButtonWithText: text => `//div[contains(@class, 'session-settings-item')]//*[contains(@class, 'session-button') and contains(string(), '${text}')]`,
settingCategoryWithText: text => `//div[contains(@class, 'left-pane-setting-category-list-item') and contains(string(), '${text}')]`,
// Confirm is a boolean. Selects confirmation input
passwordSetModalInput: _confirm => `//input[@id = 'password-modal-input${_confirm ? '-confirm' : ''}']`,
};

@ -139,14 +139,15 @@ export class SessionPasswordModal extends React.Component<Props, State> {
);
}
private async setPassword(onSuccess: any) {
if (!this.passwordInput.current || !this.passwordInputConfirm.current) {
private async setPassword(onSuccess?: any) {
// Only initial input required for PasswordAction.Remove
if (!this.passwordInput.current || (!this.passwordInputConfirm.current && this.props.action !== PasswordAction.Remove)) {
return;
}
// Trim leading / trailing whitespace for UX
const enteredPassword = String(this.passwordInput.current.value).trim();
const enteredPasswordConfirm = String(
const enteredPasswordConfirm = this.passwordInputConfirm.current && String(
this.passwordInputConfirm.current.value
).trim();
@ -178,7 +179,7 @@ export class SessionPasswordModal extends React.Component<Props, State> {
// Check if password match, when setting, changing or removing
const valid =
this.props.action !== PasswordAction.Set
? !!await this.validatePasswordHash(oldPassword)
? Boolean(await this.validatePasswordHash(oldPassword))
: enteredPassword === enteredPasswordConfirm;
if (!valid) {

Loading…
Cancel
Save