Merge pull request #7410 from arafubeatbox/imprv/116146-116147-questionnaire-tests

Imprv/116146 116147 questionnaire tests

packages/app/src/components/Admin/App/QuestionnaireSettings.tsx

@@ -70,7 +70,7 @@ const QuestionnaireSettings = (): JSX.Element => {
       {!isLoading && (
         <>
           <div className="row my-3">
-            <div className="custom-control custom-switch custom-checkbox-primary col-md-5 offset-md-5">
+            <div className="custom-control custom-switch custom-checkbox-info col-md-5 offset-md-5">
               <input
                 type="checkbox"
                 className="custom-control-input"
@@ -85,7 +85,7 @@ const QuestionnaireSettings = (): JSX.Element => {
           </div>
 
           <div className="row my-4">
-            <div className="custom-control custom-checkbox custom-checkbox-primary col-md-5 offset-md-5">
+            <div className="custom-control custom-checkbox custom-checkbox-info col-md-5 offset-md-5">
               <input
                 type="checkbox"
                 className="custom-control-input"

packages/app/src/components/Me/OtherSettings.tsx

@@ -26,7 +26,7 @@ const OtherSettings = (): JSX.Element => {
       await apiv3Put('/personal-setting/questionnaire-settings', {
         isQuestionnaireEnabled,
       });
-      toastSuccess(t('toaster.update_successed', { target: 'アンケート設定', ns: 'commons' }));
+      toastSuccess(t('toaster.update_successed', { target: t('questionnaire.settings'), ns: 'commons' }));
     }
     catch (err) {
       toastError(err);
@@ -52,7 +52,7 @@ const OtherSettings = (): JSX.Element => {
         <div className="offset-md-3 col-md-6 text-left">
           {!isLoadingCurrentUser && (
             <div className="custom-control custom-switch custom-checkbox-primary">
-              <span id="personal-questionnaire-settings-toggle">
+              <span id="grw-questionnaire-settings-toggle-wrapper">
                 <input
                   type="checkbox"
                   className="custom-control-input"
@@ -68,7 +68,7 @@ const OtherSettings = (): JSX.Element => {
               <p className="form-text text-muted small">
                 {t('questionnaire.personal_settings_explanation')}
               </p>
-              {!growiIsQuestionnaireEnabled && <UncontrolledTooltip placement="bottom" target="personal-questionnaire-settings-toggle">
+              {!growiIsQuestionnaireEnabled && <UncontrolledTooltip placement="bottom" target="grw-questionnaire-settings-toggle-wrapper">
                 {t('questionnaire.disabled_by_admin')}
               </UncontrolledTooltip> }
             </div>
@@ -78,8 +78,9 @@ const OtherSettings = (): JSX.Element => {
 
       <div className="row my-3">
         <div className="offset-4 col-5">
-          <span className="d-inline-block" id="personal-questionnaire-settings-btn">
+          <span className="d-inline-block" id="grw-questionnaire-settings-update-btn-wrapper">
             <button
+              data-testid="grw-questionnaire-settings-update-btn"
               type="button"
               className="btn btn-primary"
               onClick={onClickUpdateIsQuestionnaireEnabledHandler}
@@ -89,7 +90,7 @@ const OtherSettings = (): JSX.Element => {
               {t('Update')}
             </button>
           </span>
-          {!growiIsQuestionnaireEnabled && <UncontrolledTooltip placement="bottom" target="personal-questionnaire-settings-btn">
+          {!growiIsQuestionnaireEnabled && <UncontrolledTooltip placement="bottom" target="grw-questionnaire-settings-update-btn-wrapper">
             {t('questionnaire.disabled_by_admin')}
           </UncontrolledTooltip>}
         </div>

packages/app/src/components/Navbar/PersonalDropdown.tsx

@@ -77,7 +77,11 @@ const PersonalDropdown = (): JSX.Element => {
 
         <div className="dropdown-divider"></div>
 
-        <button type="button" className="dropdown-item" onClick={() => setQuestionnaireModalOpen(true)}>
+        <button
+          data-testid="grw-proactive-questionnaire-modal-toggle-btn"
+          type="button"
+          className="dropdown-item"
+          onClick={() => setQuestionnaireModalOpen(true)}>
           <i className="icon-fw icon-pencil"></i>{t('personal_dropdown.feedback')}
         </button>
 

packages/app/src/components/Questionnaire/ProactiveQuestionnaireModal.tsx

@@ -77,6 +77,7 @@ const ProactiveQuestionnaireModal = (props: ModalProps): JSX.Element => {
   return (
     <>
       <Modal
+        data-testid="grw-proactive-questionnaire-modal"
         size="lg"
         isOpen={isOpen}
         toggle={onClose}

packages/app/test/cypress/integration/40-admin/40-admin--access-to-admin-page.spec.ts

@@ -33,7 +33,9 @@ context('Access to Admin page', () => {
     cy.visit('/admin/app');
     cy.getByTestid('admin-app-settings').should('be.visible');
     cy.getByTestid('v5-page-migration').should('be.visible');
-    cy.get('#cbFileUpload').should('be.checked')
+    cy.get('#cbFileUpload').should('be.checked');
+    cy.get('#isQuestionnaireEnabled').should('be.checked');
+    cy.get('#isAppSiteUrlHashed').should('be.checked');
     cy.screenshot(`${ssPrefix}-admin-app`);
   });
 

packages/app/test/cypress/integration/60-home/60-home--home.spec.ts

@@ -126,4 +126,41 @@ context('Access User settings', () => {
     cy.get('.toast').should('be.visible').invoke('attr', 'style', 'opacity: 1');
     cy.screenshot(`${ssPrefix}-in-app-notification-setting-2`);
   });
+
+  it('Access Other setting', () => {
+    cy.getByTestid('grw-personal-settings').find('.nav-title.nav li:eq(6) a').click();
+    cy.scrollTo('top');
+    cy.screenshot(`${ssPrefix}-other-setting-1`);
+    cy.getByTestid('grw-questionnaire-settings-update-btn').click();
+    cy.get('.toast').should('be.visible').invoke('attr', 'style', 'opacity: 1');
+    cy.screenshot(`${ssPrefix}-other-setting-2`);
+  });
+});
+
+context('Access proactive questionnaire modal', () => {
+  const ssPrefix = 'proactive-questionnaire-modal-';
+
+  beforeEach(() => {
+    // login
+    cy.fixture("user-admin.json").then(user => {
+      cy.login(user.username, user.password);
+    });
+  });
+
+  it('Opens questionnaire modal', () => {
+    cy.visit('/dummy');
+
+    // open PersonalDropdown
+    cy.waitUntil(() => {
+      // do
+      cy.getByTestid('personal-dropdown-button').should('be.visible').click();
+      // wait until
+      return cy.getByTestid('grw-personal-dropdown-menu-user-home').then($elem => $elem.is(':visible'));
+    });
+
+    cy.getByTestid('grw-proactive-questionnaire-modal-toggle-btn').should('be.visible').click();
+    cy.getByTestid('grw-proactive-questionnaire-modal').should('be.visible');
+
+    cy.screenshot(`${ssPrefix}-opened`);
+  });
 });