AXON-1369: fixed e2e tests for bb new editor

Author: BHulovatyi

e2e/page-objects/fragments/PRComments.ts

@@ -2,7 +2,7 @@ import { expect, FrameLocator, Locator } from '@playwright/test';
 
 const COMMENT_LIST_TES_ID = 'pullrequest.comment-list';
 const FORM_TEST_ID = 'common.comment-form';
-const RICH_EDITOR_TEST_ID = 'common.rich-markdown-editor';
+const RICH_EDITOR_TEST_ID = 'common.atlaskit-editor';
 
 export class PRComments {
     readonly frame: FrameLocator;
@@ -12,8 +12,6 @@ export class PRComments {
     readonly editor: Locator;
     readonly editorContent: Locator;
     readonly editorConfirmButton: Locator;
-    readonly editorCancelButton: Locator;
-    readonly richEditorCheckbox: Locator;
     readonly commentList: Locator;
     readonly testComment: Locator;
 
@@ -24,9 +22,7 @@ export class PRComments {
         this.form = this.frame.getByTestId(FORM_TEST_ID);
         this.editor = this.form.getByTestId(RICH_EDITOR_TEST_ID);
         this.editorContent = this.editor.locator('div.ProseMirror[contenteditable="true"]');
-        this.editorConfirmButton = this.form.getByRole('button', { name: 'save' });
-        this.editorCancelButton = this.form.getByRole('button', { name: 'cancel' });
-        this.richEditorCheckbox = this.form.getByRole('checkbox');
+        this.editorConfirmButton = this.form.getByRole('button', { name: /save/i });
         this.commentList = this.frame.getByTestId(COMMENT_LIST_TES_ID);
         this.testComment = this.commentList.locator('div.MuiBox-root p').filter({ hasText: 'test comment' }).first();
     }
@@ -40,7 +36,5 @@ export class PRComments {
         await expect(this.editor).toBeVisible();
         await expect(this.editorContent).toBeVisible();
         await expect(this.editorConfirmButton).toBeVisible();
-        await expect(this.editorCancelButton).toBeVisible();
-        await expect(this.richEditorCheckbox).toBeVisible();
     }
 }

src/react/atlascode/common/CommentForm.tsx

@@ -22,15 +22,17 @@ const CommentForm: React.FC<CommentFormProps> = (props: CommentFormProps) => {
             <Grid item xs={10}>
                 <Grid container spacing={1} direction="column">
                     <Grid item>
-                        <AtlaskitEditor
-                            defaultValue={props.initialContent}
-                            onSave={props.onSave}
-                            onCancel={props.onCancel}
-                            mentionProvider={Promise.resolve({
-                                unsubscribe: () => {},
-                            } as any as AtlascodeMentionProvider)}
-                            isBitbucket={true}
-                        />
+                        <div data-testid="common.atlaskit-editor">
+                            <AtlaskitEditor
+                                defaultValue={props.initialContent}
+                                onSave={props.onSave}
+                                onCancel={props.onCancel}
+                                mentionProvider={Promise.resolve({
+                                    unsubscribe: () => {},
+                                } as any as AtlascodeMentionProvider)}
+                                isBitbucket={true}
+                            />
+                        </div>
                     </Grid>
                 </Grid>
             </Grid>