renamed few test utils

ant-design · May 21, 2023 · b03b477 · b03b477
1 parent 83423c8
commit b03b477
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 40 deletions.
diff --git a/__test__/afterChange.test.js b/__test__/afterChange.test.js
@@ -2,7 +2,7 @@ import React from "react";
 import { render, fireEvent } from "@testing-library/react";
 import Slider from "../src/index";
 import {
-  activeSlide,
+  getActiveSlide,
   clickNext,
   clickPrevious,
   getCurrentSlide
@@ -43,16 +43,15 @@ describe("After change Slider", function() {
     const { container } = render(<SliderWithAfterChange />);
     clickNext(container);
     setTimeout(() => {
-      expect(activeSlide(container).textContent).toEqual("slide2");
+      expect(getActiveSlide(container).textContent).toEqual("slide2");
     }, 1000);
     clickNext(container);
     setTimeout(() => {
-      console.log(activeSlide(container).textContent);
-      expect(activeSlide(container).textContent).toEqual("slide3");
+      expect(getActiveSlide(container).textContent).toEqual("slide3");
     }, 1000);
     clickPrevious(container);
     setTimeout(() => {
-      expect(activeSlide(container).textContent).toEqual("slide2");
+      expect(getActiveSlide(container).textContent).toEqual("slide2");
     }, 1000);
   });
 });
diff --git a/__test__/beforeChange.test.js b/__test__/beforeChange.test.js
@@ -2,7 +2,7 @@ import React from "react";
 import { render } from "@testing-library/react";
 import Slider from "../src/index";
 import {
-  activeSlide,
+  getActiveSlide,
   clickNext,
   clickPrevious,
   getCurrentSlide
@@ -39,10 +39,10 @@ describe("Slider", function() {
   it("should render", function() {
     const { container } = render(<SliderWithBeforeChange />);
     clickNext(container);
-    expect(activeSlide(container).textContent).toEqual("slide2");
+    expect(getActiveSlide(container).textContent).toEqual("slide2");
     clickNext(container);
-    expect(activeSlide(container).textContent).toEqual("slide3");
+    expect(getActiveSlide(container).textContent).toEqual("slide3");
     clickPrevious(container);
-    expect(activeSlide(container).textContent).toEqual("slide2");
+    expect(getActiveSlide(container).textContent).toEqual("slide2");
   });
 });
diff --git a/__test__/testUtils.js b/__test__/testUtils.js
@@ -8,7 +8,7 @@ import defaultProps from "../src/default-props";
 import * as slickCarousel from "slick-carousel"; // defining slick in global environment
 import { getTrackLeft } from "../src/utils/innerSliderUtils";
 import {
-  activeSlides,
+  getActiveSlides,
   getActiveSlidesCount,
   clickNext,
   clickPrevious
@@ -86,7 +86,7 @@ export function testSliderScroll({ direction, ...settings }) {
 
   let expectedSlideIndex = initialSlide || 0;
   for (let click = 0; click < 2 * noOfSlides + 2; click++) {
-    let activeslides = activeSlides(container);
+    let activeslides = getActiveSlides(container);
     let $activeSlides = $(".regular.slider").find("div.slick-active");
     expect(getActiveSlidesCount(container)).toEqual(slidesToShow || 1);
     expect($activeSlides.length).toEqual(slidesToShow || 1);

diff --git a/examples/__tests__/CentreMode.test.js b/examples/__tests__/CentreMode.test.js
@@ -3,7 +3,7 @@ import CenterMode from "../CenterMode";
 import { render } from "@testing-library/react";
 import { html as beautify_html } from "js-beautify";
 import {
-  activeSlides,
+  getActiveSlides,
   getActiveSlidesCount,
   getClonesCount,
   getCurrentSlide,
@@ -25,7 +25,7 @@ describe("CenterMode Tests", () => {
   test("Positioning test", () => {
     const { container } = render(<CenterMode />);
     let currentSlide = getCurrentSlide(container);
-    let activeslides = activeSlides(container);
+    let activeslides = getActiveSlides(container);
     expect(parseInt(currentSlide.getAttribute("data-index"))).toEqual(0);
     expect(
       Array.from(activeslides).map(e => parseInt(e.getAttribute("data-index")))
@@ -35,15 +35,15 @@ describe("CenterMode Tests", () => {
   test("Activity test", () => {
     const { container } = render(<CenterMode />);
     let currentSlide = getCurrentSlide(container);
-    let activeslides = activeSlides(container);
+    let activeslides = getActiveSlides(container);
     expect(parseInt(currentSlide.getAttribute("data-index"))).toEqual(0);
     expect(
       Array.from(activeslides).map(e => parseInt(e.getAttribute("data-index")))
     ).toEqual([-1, 0, 1]);
     clickNext(container);
 
     currentSlide = getCurrentSlide(container);
-    activeslides = activeSlides(container);
+    activeslides = getActiveSlides(container);
     expect(parseInt(currentSlide.getAttribute("data-index"))).toEqual(1);
     expect(
       Array.from(activeslides).map(e => parseInt(e.getAttribute("data-index")))

diff --git a/examples/__tests__/Fade.js b/examples/__tests__/Fade.js
@@ -1,18 +1,18 @@
 import React from "react";
 import { render } from "@testing-library/react";
 import Fade from "../Fade";
-import { activeSlide, clickNext, clickPrevious } from "../../test-utils";
+import { getActiveSlide, clickNext, clickPrevious } from "../../test-utils";
 
 describe("Fade", () => {
   it("should change slides when clicked on next & prev buttons", () => {
     const { container } = render(<Fade />);
-    let activeslide = activeSlide(container);
+    let activeslide = getActiveSlide(container);
     expect(parseInt(activeslide.getAttribute("data-index"))).toEqual(0);
     clickNext(container);
-    activeslide = activeSlide(container);
+    activeslide = getActiveSlide(container);
     expect(parseInt(activeslide.getAttribute("data-index"))).toEqual(1);
     clickPrevious(container);
-    activeslide = activeSlide(container);
+    activeslide = getActiveSlide(container);
     expect(parseInt(activeslide.getAttribute("data-index"))).toEqual(0);
   });
 });
diff --git a/examples/__tests__/SimpleSlider.test.js b/examples/__tests__/SimpleSlider.test.js
@@ -3,7 +3,7 @@ import SimpleSlider from "../SimpleSlider";
 import { render, fireEvent, waitFor, screen } from "@testing-library/react";
 import { html as beautify_html } from "js-beautify";
 import {
-  activeSlide,
+  getActiveSlide,
   clickNext,
   clickPrevious,
   hasClass,
@@ -29,7 +29,7 @@ describe("SimpleSlider example", () => {
       1
     );
     expect(
-      Array.from(activeSlide(container).children).map(
+      Array.from(getActiveSlide(container).children).map(
         e => parseInt(e.textContent) - 1
       )[0]
     ).toBe(0);

diff --git a/examples/__tests__/SlickGoTo.test.js b/examples/__tests__/SlickGoTo.test.js
@@ -10,7 +10,7 @@ describe.skip("SlickGoTo", () => {
       target: { value: 1 }
     });
     let currentImg = Array.from(
-      activeSlide(container).getElementsByTagName("img")
+      getActiveSlide(container).getElementsByTagName("img")
     )[0];
     expect(currentImg.getAttribute("src")).toEqual(
       "/img/react-slick/abstract02.jpg"
@@ -22,7 +22,7 @@ describe.skip("SlickGoTo", () => {
       target: { value: "1" }
     });
     let currentImg = Array.from(
-      activeSlide(container).getElementsByTagName("img")
+      getActiveSlide(container).getElementsByTagName("img")
     )[0];
     expect(currentImg.getAttribute("src")).toEqual(
       "/img/react-slick/abstract02.jpg"
@@ -34,7 +34,7 @@ describe.skip("SlickGoTo", () => {
       target: { value: 0 }
     });
     let currentImg = Array.from(
-      activeSlide(container).getElementsByTagName("img")
+      getActiveSlide(container).getElementsByTagName("img")
     )[0];
     expect(currentImg.getAttribute("src")).toEqual(
       "/img/react-slick/abstract01.jpg"

diff --git a/examples/__tests__/UnevenSets.test.js b/examples/__tests__/UnevenSets.test.js
@@ -4,7 +4,7 @@ import UnevenSetsFinite from "../UnevenSetsFinite";
 import UnevenSetsInfinite from "../UnevenSetsInfinite";
 import { html as beautify_html } from "js-beautify";
 import {
-  activeSlides,
+  getActiveSlides,
   clickNext,
   getActiveSlidesCount,
   getButtonsLength,
@@ -29,7 +29,7 @@ describe("UnevenSets Finite", () => {
   test("Positioning test", () => {
     const { container } = render(<UnevenSetsFinite />);
     let currentSlide = getCurrentSlide(container);
-    let activeslides = activeSlides(container);
+    let activeslides = getActiveSlides(container);
     expect(parseInt(currentSlide.getAttribute("data-index"))).toEqual(0);
     expect(
       Array.from(activeslides).map(slide =>
@@ -41,7 +41,7 @@ describe("UnevenSets Finite", () => {
   test("Activity test", () => {
     const { container } = render(<UnevenSetsFinite />);
     let currentSlide = getCurrentSlide(container);
-    let activeslides = activeSlides(container);
+    let activeslides = getActiveSlides(container);
     expect(parseInt(currentSlide.getAttribute("data-index"))).toEqual(0);
     expect(
       Array.from(activeslides).map(slide =>
@@ -52,7 +52,7 @@ describe("UnevenSets Finite", () => {
     clickNext(container);
 
     currentSlide = getCurrentSlide(container);
-    activeslides = activeSlides(container);
+    activeslides = getActiveSlides(container);
     expect(parseInt(currentSlide.getAttribute("data-index"))).toEqual(4);
     expect(
       Array.from(activeslides).map(slide =>
@@ -63,7 +63,7 @@ describe("UnevenSets Finite", () => {
     clickNext(container);
 
     currentSlide = getCurrentSlide(container);
-    activeslides = activeSlides(container);
+    activeslides = getActiveSlides(container);
     expect(parseInt(currentSlide.getAttribute("data-index"))).toEqual(4);
     expect(
       Array.from(activeslides).map(slide =>
@@ -91,7 +91,7 @@ describe("UnevenSets Infinite", () => {
   test("Positioning test", () => {
     const { container } = render(<UnevenSetsInfinite />);
     let currentSlide = getCurrentSlide(container);
-    let activeslides = activeSlides(container);
+    let activeslides = getActiveSlides(container);
     expect(parseInt(currentSlide.getAttribute("data-index"))).toEqual(0);
     expect(
       Array.from(activeslides).map(slide =>
@@ -103,7 +103,7 @@ describe("UnevenSets Infinite", () => {
   test("Activity test", () => {
     const { container } = render(<UnevenSetsInfinite />);
     let currentSlide = getCurrentSlide(container);
-    let activeslides = activeSlides(container);
+    let activeslides = getActiveSlides(container);
     expect(parseInt(currentSlide.getAttribute("data-index"))).toEqual(0);
     expect(
       Array.from(activeslides).map(slide =>
@@ -114,7 +114,7 @@ describe("UnevenSets Infinite", () => {
     clickNext(container);
 
     currentSlide = getCurrentSlide(container);
-    activeslides = activeSlides(container);
+    activeslides = getActiveSlides(container);
     expect(parseInt(currentSlide.getAttribute("data-index"))).toEqual(4);
     expect(
       Array.from(activeslides).map(slide =>

diff --git a/test-utils.js b/test-utils.js
@@ -41,13 +41,13 @@ export function getActiveButton(container) {
     container.querySelectorAll(".slick-dots .slick-active button")
   ).map(e => e.textContent);
 }
-export function getCurrentSlideIdState(container) {
-  return parseInt(getCurrentSlide(container).getAttribute("data-index")) + 1;
-}
-export function activeSlides(container) {
-  return container.querySelectorAll(".slick-slide.slick-active");
-}
-export function activeSlide(container) {
+// export function getCurrentSlideIdState(container) {
+//   return parseInt(getCurrentSlide(container).getAttribute("data-index")) + 1;
+// }
+// export function activeSlides(container) {
+//   return container.querySelectorAll(".slick-slide.slick-active");
+// }
+export function getActiveSlide(container) {
   return container.querySelector(".slick-slide.slick-active");
 }
 
@@ -56,7 +56,7 @@ export function getActiveSlides(container) {
 }
 
 export function getActiveSlidesText(container) {
-  const slides = activeSlides(container);
+  const slides = getActiveSlides(container);
   return Array.from(slides).map(e => e.textContent);
 }