Update VRT Search

https://youtrack.weseek.co.jp/issue/GW-7739
- Add data-testid for add or remove bookmark button
- Move search all pages and search current tree spec to 30-search folder
- Delete old search all pages and search current tree spec
- Implement beforeEach only to make code more compact
- Implement .should('be.visible') instead of cy.wait()

packages/app/src/components/Common/Dropdown/PageItemControl.tsx

@@ -137,6 +137,7 @@ const PageItemControlDropdownMenu = React.memo((props: DropdownMenuProps): JSX.E
           <DropdownItem
             onClick={bookmarkItemClickedHandler}
             className="grw-page-control-dropdown-item"
+            data-testid="add-remove-bookmark-btn"
           >
             <i className="fa fa-fw fa-bookmark-o grw-page-control-dropdown-icon"></i>
             { pageInfo.isBookmarked ? t('remove_bookmark') : t('add_bookmark') }

packages/app/test/cypress/integration/3-search/search-all-pages.spec.ts

@@ -1,84 +0,0 @@
-/* eslint-disable cypress/no-unnecessary-waiting */
-context('Search all pages', () => {
-  const ssPrefix = 'search-all-pages-';
-
-  let connectSid: string | undefined;
-
-  before(() => {
-    // login
-    cy.fixture("user-admin.json").then(user => {
-      cy.login(user.username, user.password);
-    });
-    cy.getCookie('connect.sid').then(cookie => {
-      connectSid = cookie?.value;
-    });
-    // collapse sidebar
-    cy.collapseSidebar(true);
-  });
-
-  beforeEach(() => {
-    if (connectSid != null) {
-      cy.setCookie('connect.sid', connectSid);
-    }
-  });
-
-  it(`Search all paeges by typing help and press ENTER`, () => {
-    const searchText = 'help';
-    cy.visit('/');
-    cy.get('div.rbt-input-hint-container > input').click();
-    cy.screenshot(`${ssPrefix}search-input-focused`, { capture: 'viewport'});
-    cy.get('div.rbt-input-hint-container > input').type(`${searchText}`);
-    cy.screenshot(`${ssPrefix}insert-search-text`, { capture: 'viewport'});
-    cy.get('div.rbt-input-hint-container > input').type('{enter}');
-    cy.screenshot(`${ssPrefix}press-enter`, { capture: 'viewport'});
-
-    cy.getByTestid('search-result-list').should('be.visible');
-
-    cy.getByTestid('open-page-item-control-btn').first().click();
-    cy.screenshot(`${ssPrefix}click-three-dots-menu`, {capture: 'viewport'});
-  });
-
-
-  it(`Search all pages by tag, ex: tag:help and press ENTER`, () => {
-    const searchText = `tag:help`;
-    cy.visit('/');
-    cy.get('div.rbt-input-hint-container > input').click();
-    cy.get('div.rbt-input-hint-container > input').type(`${searchText}`);
-    cy.screenshot(`${ssPrefix}insert-search-text-with-tag`, { capture: 'viewport'});
-    cy.get('div.rbt-input-hint-container > input').type('{enter}');
-
-    cy.getByTestid('search-result-list').should('be.visible');
-
-    cy.screenshot(`${ssPrefix}search-with-tag-result`, {capture: 'viewport'});
-
-    cy.getByTestid('open-page-item-control-btn').first().click();
-    cy.screenshot(`${ssPrefix}click-three-dots-menu-search-with-tag`, {capture: 'viewport'});
-
-    // Add Bookmark
-    cy.getByTestid('add-bookmark').first().click({force: true});
-    cy.wait(2000);
-    cy.screenshot(`${ssPrefix}add-bookmark`, {capture: 'viewport'});
-
-    // Duplicate page
-    cy.getByTestid('duplicate-page').first().click({force: true});
-    cy.wait(1000);
-    cy.screenshot(`${ssPrefix}duplicate-page`, {capture: 'viewport'});
-
-    // Close Modal
-    cy.get('body').type('{esc}');
-
-    // Move / Rename Page
-    cy.getByTestid('move-page').first().click({force: true});
-    cy.wait(1000);
-    cy.screenshot(`${ssPrefix}move-rename-page`, {capture: 'viewport'});
-
-    // Close Modal
-    cy.get('body').type('{esc}');
-
-    // Delete page
-    cy.getByTestid('delete-page').first().click({ force: true});
-    cy.wait(1000);
-    cy.screenshot(`${ssPrefix}delete-page`, {capture: 'viewport'});
-  });
-
-});

packages/app/test/cypress/integration/3-search/search-current-tree.spec.ts

@@ -1,90 +0,0 @@
-/* eslint-disable cypress/no-unnecessary-waiting */
-context('Search current tree', () => {
-  const ssPrefix = 'search-current-page-';
-
-  let connectSid: string | undefined;
-
-  before(() => {
-    // login
-    cy.fixture("user-admin.json").then(user => {
-      cy.login(user.username, user.password);
-    });
-    cy.getCookie('connect.sid').then(cookie => {
-      connectSid = cookie?.value;
-    });
-    // collapse sidebar
-    cy.collapseSidebar(true);
-  });
-
-  beforeEach(() => {
-    if (connectSid != null) {
-      cy.setCookie('connect.sid', connectSid);
-    }
-  });
-
-  it(`Search current tree by typing help and press ENTER`, () => {
-    const searchText = 'help';
-    cy.visit('/');
-    cy.getByTestid('select-search-scope').first().click({force: true});
-    cy.get('div.input-group-prepend.show > div > button:nth-child(2)').click({force: true});
-    cy.get('div.rbt-input-hint-container > input').click();
-    cy.screenshot(`${ssPrefix}search-input-focused`, { capture: 'viewport'});
-    cy.get('div.rbt-input-hint-container > input').type(`${searchText}`);
-    cy.screenshot(`${ssPrefix}insert-search-text`, { capture: 'viewport'});
-    cy.get('div.rbt-input-hint-container > input').type('{enter}');
-    cy.screenshot(`${ssPrefix}press-enter`, { capture: 'viewport'});
-
-    cy.getByTestid('search-result-list').should('be.visible');
-
-    cy.getByTestid('open-page-item-control-btn').first().click();
-    cy.screenshot(`${ssPrefix}click-three-dots-menu`, {capture: 'viewport'});
-  });
-
-
-  it(`Search current tree by tag, ex: tag:help and press ENTER`, () => {
-    const searchText = `tag:help`;
-    cy.visit('/');
-    cy.getByTestid('select-search-scope').first().click({force: true});
-    cy.get('div.input-group-prepend.show > div > button:nth-child(2)').click({force: true});
-
-    cy.get('div.rbt-input-hint-container > input').click();
-    cy.get('div.rbt-input-hint-container > input').type(`${searchText}`);
-    cy.screenshot(`${ssPrefix}insert-search-text-with-tag`, { capture: 'viewport'});
-    cy.get('div.rbt-input-hint-container > input').type('{enter}');
-
-    cy.getByTestid('search-result-list').should('be.visible');
-
-    cy.screenshot(`${ssPrefix}search-with-tag-result`, {capture: 'viewport'});
-
-    cy.getByTestid('open-page-item-control-btn').first().click();
-    cy.screenshot(`${ssPrefix}click-three-dots-menu-search-with-tag`, {capture: 'viewport'});
-
-    // Add Bookmark
-    cy.getByTestid('add-bookmark').first().click({force: true});
-    cy.wait(2000);
-    cy.screenshot(`${ssPrefix}add-bookmark`, {capture: 'viewport'});
-
-    // Duplicate page
-    cy.getByTestid('duplicate-page').first().click({force: true});
-    cy.wait(1000);
-    cy.screenshot(`${ssPrefix}duplicate-page`, {capture: 'viewport'});
-
-    // Close Modal
-    cy.get('body').type('{esc}');
-
-    // Move / Rename Page
-    cy.getByTestid('move-page').first().click({force: true});
-    cy.wait(1000);
-    cy.screenshot(`${ssPrefix}move-rename-page`, {capture: 'viewport'});
-
-    // Close Modal
-    cy.get('body').type('{esc}');
-
-    // Delete page
-    cy.getByTestid('delete-page').first().click({ force: true});
-    cy.wait(1000);
-    cy.screenshot(`${ssPrefix}delete-page`, {capture: 'viewport'});
-
-  });
-
-});

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

@@ -68,3 +68,152 @@ context('Access to legacy private pages', () => {
   });
 
 });
+
+context('Search all pages', () => {
+  const ssPrefix = 'search-all-pages-';
+
+  beforeEach(() => {
+    // login
+    cy.fixture("user-admin.json").then(user => {
+      cy.login(user.username, user.password);
+    });
+    // collapse sidebar
+    cy.collapseSidebar(true);
+  });
+
+  it(`Search all pages by word is successfully loaded`, () => {
+    const searchText = 'help';
+    cy.visit('/');
+    cy.get('.rbt-input').click();
+    cy.screenshot(`${ssPrefix}search-input-focused`, { capture: 'viewport'});
+    cy.get('.rbt-input-main').type(`${searchText}`);
+    cy.screenshot(`${ssPrefix}insert-search-text`, { capture: 'viewport'});
+    cy.get('.rbt-input-main').type('{enter}');
+    cy.screenshot(`${ssPrefix}press-enter`, { capture: 'viewport'});
+
+    cy.getByTestid('search-result-list').should('be.visible');
+
+    cy.getByTestid('open-page-item-control-btn').first().click();
+    cy.screenshot(`${ssPrefix}click-three-dots-menu`, {capture: 'viewport'});
+  });
+
+  it(`Search all pages by tag is successfully loaded `, () => {
+    const searchText = `tag:help`;
+    cy.visit('/');
+    cy.get('.rbt-input').click();
+    cy.get('.rbt-input-main').type(`${searchText}`);
+    cy.screenshot(`${ssPrefix}insert-search-text-with-tag`, { capture: 'viewport'});
+    cy.get('.rbt-input-main').type('{enter}');
+    cy.getByTestid('search-result-list').should('be.visible');
+    cy.screenshot(`${ssPrefix}search-with-tag-result`, {capture: 'viewport'});
+    cy.getByTestid('open-page-item-control-btn').first().click();
+    cy.screenshot(`${ssPrefix}click-three-dots-menu-search-with-tag`, {capture: 'viewport'});
+
+    // Add Bookmark
+    cy.getByTestid('add-remove-bookmark-btn').first().click({force: true});
+    cy.get('.btn-bookmark.active').should('be.visible');
+    cy.screenshot(`${ssPrefix}add-bookmark`, {capture: 'viewport'});
+
+    // Duplicate page
+    cy.getByTestid('open-page-duplicate-modal-btn').first().click({force: true});
+    cy.getByTestid('page-duplicate-modal').should('be.visible');
+    cy.screenshot(`${ssPrefix}duplicate-page`, {capture: 'viewport'});
+
+    // Close Modal
+    cy.get('body').type('{esc}');
+
+    // Move / Rename Page
+    cy.getByTestid('open-page-move-rename-modal-btn').first().click({force: true});
+    cy.getByTestid('page-rename-modal').should('be.visible');
+    cy.screenshot(`${ssPrefix}move-rename-page`, {capture: 'viewport'});
+
+    // Close Modal
+    cy.get('body').type('{esc}');
+
+    // Delete page
+    cy.getByTestid('open-page-delete-modal-btn').first().click({ force: true});
+    cy.getByTestid('page-delete-modal').should('be.visible');
+    cy.screenshot(`${ssPrefix}delete-page`, {capture: 'viewport'});
+
+  });
+
+});
+
+context('Search current tree', () => {
+  const ssPrefix = 'search-current-tree-';
+
+  beforeEach(() => {
+    // login
+    cy.fixture("user-admin.json").then(user => {
+      cy.login(user.username, user.password);
+    });
+    // collapse sidebar
+    cy.collapseSidebar(true);
+  });
+
+  it(`Search current tree by word is successfully loaded`, () => {
+    const searchText = 'help';
+    cy.visit('/');
+    cy.getByTestid('select-search-scope').first().click({force: true});
+    cy.get('.input-group-prepend.show > div > button:nth-child(2)').click({force: true});
+    cy.get('.rbt-input').click();
+    cy.screenshot(`${ssPrefix}search-input-focused`, { capture: 'viewport'});
+    cy.get('.rbt-input').type(`${searchText}`);
+    cy.screenshot(`${ssPrefix}insert-search-text`, { capture: 'viewport'});
+    cy.get('.rbt-input').type('{enter}');
+    cy.screenshot(`${ssPrefix}press-enter`, { capture: 'viewport'});
+
+    cy.getByTestid('search-result-list').should('be.visible');
+
+    cy.getByTestid('open-page-item-control-btn').first().click();
+    cy.screenshot(`${ssPrefix}click-three-dots-menu`, {capture: 'viewport'});
+  });
+
+
+  it(`Search current tree by tag is successfully loaded`, () => {
+    const searchText = `tag:help`;
+    cy.visit('/');
+    cy.getByTestid('select-search-scope').first().click({force: true});
+    cy.get('.input-group-prepend.show > div > button:nth-child(2)').click({force: true});
+
+    cy.get('.rbt-input').click();
+    cy.get('.rbt-input').type(`${searchText}`);
+    cy.screenshot(`${ssPrefix}insert-search-text-with-tag`, { capture: 'viewport'});
+    cy.get('.rbt-input').type('{enter}');
+
+    cy.getByTestid('search-result-list').should('be.visible');
+
+    cy.screenshot(`${ssPrefix}search-with-tag-result`, {capture: 'viewport'});
+
+    cy.getByTestid('open-page-item-control-btn').first().click();
+    cy.screenshot(`${ssPrefix}click-three-dots-menu-search-with-tag`, {capture: 'viewport'});
+
+    // Add Bookmark
+    cy.getByTestid('add-remove-bookmark-btn').first().click({force: true});
+    cy.get('.btn-bookmark.active').should('be.visible');
+    cy.screenshot(`${ssPrefix}add-bookmark`, {capture: 'viewport'});
+
+    // Duplicate page
+    cy.getByTestid('open-page-duplicate-modal-btn').first().click({force: true});
+    cy.getByTestid('page-duplicate-modal').should('be.visible');
+    cy.screenshot(`${ssPrefix}duplicate-page`, {capture: 'viewport'});
+
+    // Close Modal
+    cy.get('body').type('{esc}');
+
+    // Move / Rename Page
+    cy.getByTestid('open-page-move-rename-modal-btn').first().click({force: true});
+    cy.getByTestid('page-rename-modal').should('be.visible');
+    cy.screenshot(`${ssPrefix}move-rename-page`, {capture: 'viewport'});
+
+    // Close Modal
+    cy.get('body').type('{esc}');
+
+    // Delete page
+    cy.getByTestid('open-page-delete-modal-btn').first().click({ force: true});
+    cy.getByTestid('page-delete-modal').should('be.visible');
+    cy.screenshot(`${ssPrefix}delete-page`, {capture: 'viewport'});
+
+  });
+
+});