Merge pull request #590 from shopgate/PWA-1198-e2e

Patch for e2e tests for new slider implementation
shopgate · Apr 1, 2019 · 5fa0dca · 5fa0dca
2 parents 5dcb239 + 0bff996
commit 5fa0dca
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 28 deletions.
diff --git a/themes/theme-gmd/e2e/elements/de.js b/themes/theme-gmd/e2e/elements/de.js
@@ -4,8 +4,8 @@ export default {
   navigationDrawerLoginButton: "[data-test-id='navDrawerLoginButton']",
   navigationDrawerEntry: "[data-test-id='NavDrawer'] [data-test-id='Ripple'] span",
   shopLogo: "[data-test-id='Navigator'] img",
-  imageSliderImage1: "[data-test-id='Slider']:nth-child(2)  img[data-test-id='withoutLink']",
-  imageSliderImage2: "[data-test-id='Slider']:nth-child(3)  img[data-test-id='withoutLink']",
+  imageSliderImage1: "[data-test-id='Slider']:nth-child(1) img[data-test-id='link: /cart']",
+  imageSliderImage2: "[data-test-id='Slider']:nth-child(2) img[data-test-id='link: /cart']",
   imageWidgetWithLink1: "[data-test-id='imageWidget: /category/3537']",
   productSliderProduct1: "[data-test-id='Slider'] [data-test-id='Productname: Product with long description -4-']",
   liveShoppingWidgetWithExpectedProduct: "[data-test-id='liveShoppingWidget'] [data-test-id='product with base price 1']",

diff --git a/themes/theme-gmd/e2e/helper/navigation.js b/themes/theme-gmd/e2e/helper/navigation.js
@@ -5,7 +5,6 @@ import { navigatorButton, backButton, navigationDrawerBackdrop } from '../elemen
  * Open the navDrawer
  */
 export function openNavDrawer() {
-  cy.reload();
   cy.get(navigatorButton)
     .should('be.visible')
     .click();

diff --git a/themes/theme-gmd/e2e/integration/consistency/StartPage.js b/themes/theme-gmd/e2e/integration/consistency/StartPage.js
@@ -1,13 +1,16 @@
 import els from '../../elements/de';
+import { openNavDrawer, closeNavDrawer } from '../../helper/navigation';
 
 describe('AndroidGMDTest startPage', () => {
+  afterEach(() => {
+    cy.get(els.shopLogo).scrollIntoView();
+  });
+
   it('should check Navigation Drawer', () => {
     // Open page
     cy.visit('');
 
-    // Click on Navigation button
-    cy.get(els.navigatorButton)
-      .click();
+    openNavDrawer();
 
     // Check for drawer entries
     cy.get(els.navigationDrawerLoginButton)
@@ -34,13 +37,10 @@ describe('AndroidGMDTest startPage', () => {
     cy.get(els.navDrawerImprintButton)
       .scrollIntoView()
       .should('be.visible');
+    closeNavDrawer();
   });
 
   it('should check for shop logo', () => {
-    // Open page
-    cy.visit('');
-    cy.wait(500);
-
     // Check for logo
     cy.get(els.shopLogo)
       .should('be.visible');

diff --git a/themes/theme-gmd/widgets/ImageSlider/__snapshots__/spec.jsx.snap b/themes/theme-gmd/widgets/ImageSlider/__snapshots__/spec.jsx.snap
@@ -219,12 +219,10 @@ exports[`<ImageSliderWidget /> should map the correct image settings to the comp
                 >
                   <Connect(Link)
                     className="css-63oe3q"
-                    data-test-id="withLink"
                     href="http://example.com"
                   >
                     <Link
                       className="css-63oe3q"
-                      data-test-id="withLink"
                       disabled={false}
                       historyPush={[Function]}
                       historyReplace={[Function]}
@@ -245,7 +243,7 @@ exports[`<ImageSliderWidget /> should map the correct image settings to the comp
                               "data-css-1rozygh": "",
                             }
                           }
-                          data-test-id="link : undefined"
+                          data-test-id="link: http://example.com"
                           src="http://placehold.it/350x150"
                         />
                       </div>
@@ -263,12 +261,10 @@ exports[`<ImageSliderWidget /> should map the correct image settings to the comp
                 >
                   <Connect(Link)
                     className="css-63oe3q"
-                    data-test-id="withLink"
                     href="http://other.example.com"
                   >
                     <Link
                       className="css-63oe3q"
-                      data-test-id="withLink"
                       disabled={false}
                       historyPush={[Function]}
                       historyReplace={[Function]}
@@ -289,7 +285,7 @@ exports[`<ImageSliderWidget /> should map the correct image settings to the comp
                               "data-css-1rozygh": "",
                             }
                           }
-                          data-test-id="link : undefined"
+                          data-test-id="link: http://other.example.com"
                           src="http://placehold.it/10x10"
                         />
                       </div>
@@ -651,7 +647,7 @@ exports[`<ImageSliderWidget /> should render the images with links 1`] = `
                         "data-css-1rozygh": "",
                       }
                     }
-                    data-test-id="link : undefined"
+                    data-test-id="link: null"
                     src="http://placehold.it/350x150"
                   />
                 </div>
@@ -666,12 +662,10 @@ exports[`<ImageSliderWidget /> should render the images with links 1`] = `
                 >
                   <Connect(Link)
                     className="css-63oe3q"
-                    data-test-id="withLink"
                     href="http://other.example.com"
                   >
                     <Link
                       className="css-63oe3q"
-                      data-test-id="withLink"
                       disabled={false}
                       historyPush={[Function]}
                       historyReplace={[Function]}
@@ -692,7 +686,7 @@ exports[`<ImageSliderWidget /> should render the images with links 1`] = `
                               "data-css-1rozygh": "",
                             }
                           }
-                          data-test-id="link : undefined"
+                          data-test-id="link: http://other.example.com"
                           src="http://placehold.it/10x10"
                         />
                       </div>
@@ -931,12 +925,10 @@ exports[`<ImageSliderWidget /> should render the slider with the correct number
                 >
                   <Connect(Link)
                     className="css-63oe3q"
-                    data-test-id="withLink"
                     href="http://example.com"
                   >
                     <Link
                       className="css-63oe3q"
-                      data-test-id="withLink"
                       disabled={false}
                       historyPush={[Function]}
                       historyReplace={[Function]}
@@ -957,7 +949,7 @@ exports[`<ImageSliderWidget /> should render the slider with the correct number
                               "data-css-1rozygh": "",
                             }
                           }
-                          data-test-id="link : undefined"
+                          data-test-id="link: http://example.com"
                           src="http://placehold.it/350x150"
                         />
                       </div>
@@ -975,12 +967,10 @@ exports[`<ImageSliderWidget /> should render the slider with the correct number
                 >
                   <Connect(Link)
                     className="css-63oe3q"
-                    data-test-id="withLink"
                     href="http://other.example.com"
                   >
                     <Link
                       className="css-63oe3q"
-                      data-test-id="withLink"
                       disabled={false}
                       historyPush={[Function]}
                       historyReplace={[Function]}
@@ -1001,7 +991,7 @@ exports[`<ImageSliderWidget /> should render the slider with the correct number
                               "data-css-1rozygh": "",
                             }
                           }
-                          data-test-id="link : undefined"
+                          data-test-id="link: http://other.example.com"
                           src="http://placehold.it/10x10"
                         />
                       </div>

diff --git a/themes/theme-gmd/widgets/ImageSlider/index.jsx b/themes/theme-gmd/widgets/ImageSlider/index.jsx
@@ -41,12 +41,12 @@ const ImageSliderWidget = ({ settings, className }) => {
       loop={settings.loop}
     >
       {settings.images.map(({ image, alt, link }) => {
-        const img = <img src={image} alt={alt} className={imgStyle} data-test-id={`link : ${settings.link}`} />;
+        const img = <img src={image} alt={alt} className={imgStyle} data-test-id={`link: ${link}`} />;
 
         if (link) {
           return (
             <Swiper.Item key={image}>
-              <Link href={link} className={linkStyle} data-test-id="withLink">
+              <Link href={link} className={linkStyle}>
                 {img}
               </Link>
             </Swiper.Item>