Taichi Masuyama 3 лет назад
Родитель
Сommit
4b2d8170bf

+ 7 - 9
packages/app/src/components/Page/RevisionRenderer.tsx

@@ -22,15 +22,13 @@ const RevisionRenderer = React.memo((props: Props): JSX.Element => {
   } = props;
 
   return (
-    <>
-      <ReactMarkdown
-        {...rendererOptions}
-        className={`wiki ${additionalClassName ?? ''}`}
-      >
-        {markdown}
-      </ReactMarkdown>
-      <div className="d-none" data-testid="wiki"></div>
-    </>
+    <ReactMarkdown
+      data-testid="wiki"
+      {...rendererOptions}
+      className={`wiki ${additionalClassName ?? ''}`}
+    >
+      {markdown}
+    </ReactMarkdown>
   );
 
   // const [html, setHtml] = useState('');

+ 4 - 4
packages/app/test/cypress/integration/30-search/search.spec.ts

@@ -210,11 +210,11 @@ context('Search all pages', () => {
     cy.getByTestid('search-result-base').should('be.visible');
     cy.getByTestid('search-result-list').should('be.visible');
     cy.getByTestid('search-result-content').should('be.visible');
+    cy.get('.wiki').should('be.visible');
     cy.waitUntilSpinnerDisappear();
 
     // force to add 'active' to pass VRT: https://github.com/weseek/growi/pull/6603
     cy.getByTestid('page-list-item-L').first().invoke('addClass', 'active');
-    cy.getByTestid('wiki').should('exists');
     cy.screenshot(`${ssPrefix}1-tag-order-click-tag-name`, {capture: 'viewport'});
 
     cy.get('.grw-search-page-nav').within(() => {
@@ -225,7 +225,7 @@ context('Search all pages', () => {
     cy.getByTestid('search-result-base').should('be.visible');
     cy.getByTestid('search-result-list').should('be.visible');
     cy.getByTestid('search-result-content').should('be.visible');
-    cy.getByTestid('wiki').should('exists');
+    cy.get('.wiki').should('be.visible');
     cy.screenshot(`${ssPrefix}2-tag-order-by-relevance`);
 
     cy.get('.grw-search-page-nav').within(() => {
@@ -236,7 +236,7 @@ context('Search all pages', () => {
     cy.getByTestid('search-result-base').should('be.visible');
     cy.getByTestid('search-result-list').should('be.visible');
     cy.getByTestid('search-result-content').should('be.visible');
-    cy.getByTestid('wiki').should('exists');
+    cy.get('.wiki').should('be.visible');
     cy.screenshot(`${ssPrefix}3-tag-order-by-creation-date`);
 
     cy.get('.grw-search-page-nav').within(() => {
@@ -247,9 +247,9 @@ context('Search all pages', () => {
     cy.getByTestid('search-result-base').should('be.visible');
     cy.getByTestid('search-result-list').should('be.visible');
     cy.getByTestid('search-result-content').should('be.visible');
+    cy.get('.wiki').should('be.visible');
     cy.waitUntilSpinnerDisappear();
 
-    cy.getByTestid('wiki').should('exists');
     cy.screenshot(`${ssPrefix}4-tag-order-by-last-update-date`);
   });