Merge pull request #1506 from Bilb/fix-regression-tests-modal-changes

fix: regression tests with modal changes

Author: Bilb

ts/components/conversation/composition/CompositionBox.tsx

@@ -419,12 +419,7 @@ class CompositionBoxInner extends Component<Props, State> {
           type="file"
           onChange={this.onChoseAttachment}
         />
-        <StyledSendMessageInput
-          role="main"
-          dir={this.props.htmlDirection}
-          ref={this.container}
-          data-testid="message-input"
-        >
+        <StyledSendMessageInput role="main" dir={this.props.htmlDirection} ref={this.container}>
           <CompositionTextArea
             draft={this.state.draft}
             initialDraft={this.state.initialDraft}

ts/components/conversation/composition/CompositionTextArea.tsx

@@ -582,6 +582,7 @@ export const CompositionTextArea = (props: Props) => {
         aria-haspopup="listbox"
         aria-autocomplete="list"
         aria-label={messagePlaceHolder}
+        data-testid="message-input-text-area"
       />
       {showPopover ? (
         <SessionPopoverContent

ts/components/dialog/SessionSetPasswordDialog.tsx

@@ -126,23 +126,23 @@ export class SessionSetPasswordDialog extends Component<Props, State> {
             {...sharedInputProps}
             placeholder={placeholders[0]}
             onValueChanged={this.onPasswordInput}
-            data-testid="password-input"
+            inputDataTestId="password-input"
             autoFocus={true}
           />
           {passwordAction !== 'enter' && passwordAction !== 'remove' && (
             <SimpleSessionInput
               {...sharedInputProps}
               placeholder={placeholders[1]}
               onValueChanged={this.onPasswordConfirmInput}
-              data-testid="password-input-confirm"
+              inputDataTestId="password-input-confirm"
             />
           )}
           {passwordAction === 'change' && (
             <SimpleSessionInput
               {...sharedInputProps}
               placeholder={placeholders[2]}
               onValueChanged={this.onPasswordRetypeInput}
-              data-testid="password-input-reconfirm"
+              inputDataTestId="password-input-reconfirm"
             />
           )}
         </ModalFlexContainer>

ts/session/apis/seed_node_api/SeedNodeAPI.ts

@@ -98,7 +98,6 @@ const getSslAgentForSeedNode = async (seedNodeHost: string, isSsl = false) => {
     // so in production, rejectUnauthorized must be true.
     rejectUnauthorized: true,
     keepAlive: true,
-
     checkServerIdentity: (host: string, cert: any) => {
       window.log.info(`seednode checkServerIdentity: ${host}`);
       // Make sure the certificate is issued to the host we are connected to

ts/session/onions/onionPath.ts

@@ -314,7 +314,7 @@ export async function testGuardNode(snode: Snode) {
   try {
     // Log this line for testing
     // curl -k -X POST -H 'Content-Type: application/json' -d '"+fetchOptions.body.replace(/"/g, "\\'")+"'", url
-    window?.log?.info('insecureNodeFetch => plaintext for testGuardNode');
+    window?.log?.info('insecureNodeFetch => plaintext for testGuardNode:', url);
 
     response = await insecureNodeFetch(url, fetchOptions);
   } catch (e) {