test(overlays): improving overlay tests

Author: ShaneK

packages/vue/test/base/src/views/Overlays.vue

@@ -64,6 +64,10 @@
         Modal onDidPresent: <div id="didPresent">{{ didPresent }}</div><br />
         Modal onWillDismiss: <div id="willDismiss">{{ willDismiss }}</div><br />
         Modal onDidDismiss: <div id="didDismiss">{{ didDismiss }}</div><br />
+        Modal ionModalWillPresent: <div id="ionModalWillPresent">{{ ionModalWillPresent }}</div><br />
+        Modal ionModalDidPresent: <div id="ionModalDidPresent">{{ ionModalDidPresent }}</div><br />
+        Modal ionModalWillDismiss: <div id="ionModalWillDismiss">{{ ionModalWillDismiss }}</div><br />
+        Modal ionModalDidDismiss: <div id="ionModalDidDismiss">{{ ionModalDidDismiss }}</div><br />
       </div>
 
       <ion-action-sheet
@@ -98,6 +102,10 @@
         @didPresent="onModalDidPresent"
         @willDismiss="onModalWillDismiss"
         @didDismiss="onModalDidDismiss"
+        @ionModalWillPresent="onModalIonWillPresent"
+        @ionModalDidPresent="onModalIonDidPresent"
+        @ionModalWillDismiss="onModalIonWillDismiss"
+        @ionModalDidDismiss="onModalIonDidDismiss"
       >
         <ModalContent :title="overlayProps.title"></ModalContent>
       </ion-modal>
@@ -335,21 +343,37 @@ export default defineComponent({
     const didPresent = ref(0);
     const willDismiss = ref(0);
     const didDismiss = ref(0);
+    const ionModalWillPresent = ref(0);
+    const ionModalDidPresent = ref(0);
+    const ionModalWillDismiss = ref(0);
+    const ionModalDidDismiss = ref(0);
 
     const onModalWillPresent = () => willPresent.value += 1;
     const onModalDidPresent = () => { didPresent.value += 1; setModalRef(true); }
     const onModalWillDismiss = () => willDismiss.value += 1;
     const onModalDidDismiss = () => { didDismiss.value += 1; setModalRef(false); }
+    const onModalIonWillPresent = () => ionModalWillPresent.value += 1;
+    const onModalIonDidPresent = () => ionModalDidPresent.value += 1;
+    const onModalIonWillDismiss = () => ionModalWillDismiss.value += 1;
+    const onModalIonDidDismiss = () => ionModalDidDismiss.value += 1;
 
     return {
       onModalWillPresent,
       onModalDidPresent,
       onModalWillDismiss,
       onModalDidDismiss,
+      onModalIonWillPresent,
+      onModalIonDidPresent,
+      onModalIonWillDismiss,
+      onModalIonDidDismiss,
       willPresent,
       didPresent,
       willDismiss,
       didDismiss,
+      ionModalWillPresent,
+      ionModalDidPresent,
+      ionModalWillDismiss,
+      ionModalDidDismiss,
       changeLoadingProps,
       overlayProps,
       present,

packages/vue/test/base/tests/e2e/specs/overlays.cy.js

@@ -1,7 +1,11 @@
 const testController = (overlay, shadow = false) => {
   const selector = `.${overlay}-controller`;
-  cy.get(`ion-radio#${overlay}`).click();
-  cy.get('ion-radio#controller').click();
+  cy.get(`ion-radio#${overlay}`)
+    .scrollIntoView({ offset: { top: -100, left: 0 } })
+    .click({ force: true });
+  cy.get('ion-radio#controller')
+    .scrollIntoView({ offset: { top: -100, left: 0 } })
+    .click({ force: true });
 
   cy.get('ion-button#present-overlay').click();
   cy.get(selector).should('exist').should('be.visible');
@@ -16,8 +20,12 @@ const testController = (overlay, shadow = false) => {
 }
 
 const testComponent = (overlay, shadow = false) => {
-  cy.get(`ion-radio#${overlay}`).click();
-  cy.get('ion-radio#component').click();
+  cy.get(`ion-radio#${overlay}`)
+    .scrollIntoView({ offset: { top: -100, left: 0 } })
+    .click({ force: true });
+  cy.get('ion-radio#component')
+    .scrollIntoView({ offset: { top: -100, left: 0 } })
+    .click({ force: true });
 
   cy.get('ion-button#present-overlay').click();
   cy.get(overlay).should('exist').should('be.visible');
@@ -40,8 +48,12 @@ const testComponent = (overlay, shadow = false) => {
 }
 
 const testInlineOverlay = (overlay, shadow = false) => {
-  cy.get(`ion-radio#${overlay}`).click();
-  cy.get('ion-radio#component').click();
+  cy.get(`ion-radio#${overlay}`)
+    .scrollIntoView({ offset: { top: -100, left: 0 } })
+    .click({ force: true });
+  cy.get('ion-radio#component')
+    .scrollIntoView({ offset: { top: -100, left: 0 } })
+    .click({ force: true });
 
   cy.get('ion-button#present-overlay').click();
   cy.get(overlay).should('exist').should('be.visible');
@@ -214,6 +226,49 @@ describe('Overlays', () => {
     });
   });
 
+  it('should fire long-form lifecycle events on overlays', () => {
+    cy.get('ion-radio#ion-modal').click();
+    cy.get('ion-radio#component').click();
+
+    cy.get('ion-button#present-overlay').click();
+    cy.get('ion-modal').should('exist');
+
+    testLongLifecycle('overlays', {
+      willPresent: 1,
+      didPresent: 1,
+      willDismiss: 0,
+      didDismiss: 0
+    });
+
+    cy.get('ion-modal #dismiss').click();
+
+    testLongLifecycle('overlays', {
+      willPresent: 1,
+      didPresent: 1,
+      willDismiss: 1,
+      didDismiss: 1
+    });
+
+    cy.get('ion-button#present-overlay').click();
+    cy.get('ion-modal').should('exist');
+
+    testLongLifecycle('overlays', {
+      willPresent: 2,
+      didPresent: 2,
+      willDismiss: 1,
+      didDismiss: 1
+    });
+
+    cy.get('ion-modal #dismiss').click();
+
+    testLongLifecycle('overlays', {
+      willPresent: 2,
+      didPresent: 2,
+      willDismiss: 2,
+      didDismiss: 2
+    });
+  });
+
   it('should unmount modal via component', () => {
     cy.get('ion-radio#ion-modal').click();
     cy.get('ion-radio#component').click();
@@ -260,3 +315,9 @@ const testLifecycle = (selector, expected = {}) => {
   cy.get(`[data-pageid=${selector}] #didDismiss`).should('have.text', expected.didDismiss);
 }
 
+const testLongLifecycle = (selector, expected = {}) => {
+  cy.get(`[data-pageid=${selector}] #ionModalWillPresent`).should('have.text', expected.willPresent);
+  cy.get(`[data-pageid=${selector}] #ionModalDidPresent`).should('have.text', expected.didPresent);
+  cy.get(`[data-pageid=${selector}] #ionModalWillDismiss`).should('have.text', expected.willDismiss);
+  cy.get(`[data-pageid=${selector}] #ionModalDidDismiss`).should('have.text', expected.didDismiss);
+}